# HG changeset patch
# User Tero Marttila <terom@fixme.fi>
# Date 1234477926 -7200
# Node ID 2d75e13397a89e99d96be73b534244ac82412c5f
# Parent  b5f746e9c3c27bf6f1c439a49cc01847d4710119# Parent  86aebc9cb60bac46e88c3114f37eb8c359614335
merge quickfixes

diff -r b5f746e9c3c2 -r 2d75e13397a8 config.py
--- a/config.py	Thu Feb 12 23:07:18 2009 +0200
+++ b/config.py	Fri Feb 13 00:32:06 2009 +0200
@@ -35,26 +35,26 @@
 
 # the log parser that we use
 LOG_PARSER                      = IrssiParser(LOG_TIMEZONE, LOG_TIMESTAMP_FMT)
-LOG_PARSER_FULLTS               = IrssiParser(LOG_TIMEZONE, '%Y%m%d%H%M%S')
+#LOG_PARSER_FULLTS               = IrssiParser(LOG_TIMEZONE, '%Y%m%d%H%M%S')
 
 # the statically defined channel list
 LOG_CHANNELS                    = ChannelList([
     LogChannel('tycoon',    "OFTC",     "#tycoon", 
-        LogDirectory(relpath('logs/tycoon'),    LOG_TIMEZONE, LOG_PARSER, LOG_DECODER, LOG_FILENAME_FMT)
+        LogDirectory(relpath('/home/spbot/irclogs/tycoon'),    LOG_TIMEZONE, LOG_PARSER, LOG_DECODER, LOG_FILENAME_FMT)
     ),
 
     LogChannel('openttd',   "OFTC",     "#openttd", 
-        LogDirectory(relpath('logs/openttd'),   LOG_TIMEZONE, LOG_PARSER, LOG_DECODER, LOG_FILENAME_FMT)
+        LogDirectory(relpath('/home/spbot/irclogs/openttd'),   LOG_TIMEZONE, LOG_PARSER, LOG_DECODER, LOG_FILENAME_FMT)
     ),
 
     LogChannel('test',      "TEST",     "#test",
-        LogDirectory(relpath('/home/terom/irclogs/test'),  LOG_TIMEZONE, LOG_PARSER_FULLTS, LOG_DECODER, LOG_FILENAME_FMT)
+        LogDirectory(relpath('/home/spbot/irclogs/test'),  LOG_TIMEZONE, LOG_PARSER, LOG_DECODER, LOG_FILENAME_FMT)
     )
 ])
 
 # version stuff
 HGWEB_URL                       = "http://hg.qmsk.net/irclogs2"
-VERSION_LINK                    = version.version_link_hg(HGWEB_URL)
+VERSION_LINK                    = version.version_link_hg(HGWEB_URL, "/var/www/irclogs.qmsk.net")
 
 # Footer text to display
 HTML_FOOTER_TEXT                = '<a href="http://projects.qmsk.net/irclogs2">irclogs2</a> version %s' % (VERSION_LINK)
@@ -104,5 +104,6 @@
 )
 
 # search index database path
-SEARCH_INDEX_PATH               = 'logs/index'
+SEARCH_INDEX_PATH               = '/home/spbot/irclogs/search-index'
+SEARCH_AUTOINDEX_PATH           = '/home/spbot/irclogs/search-autoindex'
 
diff -r b5f746e9c3c2 -r 2d75e13397a8 log_search.py
--- a/log_search.py	Thu Feb 12 23:07:18 2009 +0200
+++ b/log_search.py	Fri Feb 13 00:32:06 2009 +0200
@@ -74,7 +74,7 @@
             'r':    hype.Database.DBREADER,
             'w':    hype.Database.DBWRITER | hype.Database.DBCREAT,
             'a':    hype.Database.DBWRITER,
-            'c':    hype.Database.DBCREAT,
+            'c':    hype.Database.DBWRITER | hype.Database.DBCREAT,
         }
 
         # flags to use, standard modes
diff -r b5f746e9c3c2 -r 2d75e13397a8 scripts/search-index
--- a/scripts/search-index	Thu Feb 12 23:07:18 2009 +0200
+++ b/scripts/search-index	Fri Feb 13 00:32:06 2009 +0200
@@ -197,7 +197,8 @@
         except CommandError, e :
             # skip?
             if options.skip_missing :
-                print "[ERROR] %s" % (date_name, e)
+                if not options.quiet :
+                    print "[ERROR] %s" % (date_name, e)
                 continue
 
             else :
@@ -205,8 +206,9 @@
         
         # get the set of days
         days = list(channel.source.get_month_days(month))
-
-        print "Loading %d days of logs:" % (len(days))
+        
+        if not options.quiet :
+            print "Loading %d days of logs:" % (len(days))
 
         # load each day
         for date in days :
@@ -304,7 +306,8 @@
     # reset autoload state?
     if options.reset :
         _autoload_reset(options, channels)
-        print
+        if not options.quiet :
+            print
 
     # iterate channels
     for channel in channels :
@@ -423,7 +426,8 @@
         statefile_tmp.close()
         os.remove(statefile_tmppath)
         
-        print
+        if not options.quiet :
+            print
     
     # done
     return
@@ -549,11 +553,11 @@
                                                 action="store_true"                                         )
 
     general.add_option(     "--formatter",      dest="formatter_name",  help="LogFormatter to use",                 
-            metavar="FMT",  type="choice",                              default="irssi",
+            metavar="FMT",  type="choice",                              default=config.PREF_FORMATTER_DEFAULT.name,
             choices=[fmt_name for fmt_name in config.LOG_FORMATTERS.iterkeys()]                             )
 
     general.add_option(     "--index",          dest="index_path",      help="Index database path",                 
-            metavar="PATH",                                             default="logs/index"                )
+            metavar="PATH",                                             default=config.SEARCH_INDEX_PATH    )
 
     general.add_option(     "--timezone",       dest="timezone",        help="Timezone for output",                 
             metavar="TZ",   type="timezone",                            default=pytz.utc                    )
@@ -579,7 +583,7 @@
     # cmd_autoload options  #                   #                       #                                   #
     autoload = optparse.OptionGroup(parser, "Autoload Options")
     autoload.add_option(    "--autoload-state", dest="autoload_state_path", help="Path to autoload state dir",      
-            metavar="PATH",                                             default="logs/autoload-state"       )
+            metavar="PATH",                                             default=config.SEARCH_AUTOINDEX_PATH)
 
     autoload.add_option(    "--from",           dest="after",           help="Only autoload logfiles from the given date on", 
             metavar="DATE", type="date",        action="parse_date",    default=None                        )