Changeset 17863 for gsdl

Timestamp:

2008-11-15T15:01:04+13:00 (15 years ago)

Author:

anna

Message:

change the name tidy_html switch in HTMLPlug into use_realistic_book in HTMLPlugin

Location:

gsdl/trunk

Files:

• perllib/plugins/HTMLPlugin.pm (modified) (2 diffs)
• runtime-src/src/colservr/collectserver.cpp (modified) (5 diffs)
• runtime-src/src/recpt/comproto.asn (modified) (1 diff)
• runtime-src/src/recpt/statusaction.cpp (modified) (1 diff)
• runtime-src/src/z3950/z3950proto.cpp (modified) (1 diff)

gsdl/trunk/perllib/plugins/HTMLPlugin.pm

@@ -399 +399 @@
     # tidy the input file
     my $tidy_output_filename = $hdl_output_filename;
-    if ($self->{'tidy_html'})
+    if ($self->{'use_realistic_book'})
     {
         $tidy_output_filename = &util::filename_cat($tmp_dirname, "$tailname$suffix");
@@ -498 +498 @@
     $suffix = lc($suffix);   
     
-    if (($self->{'tidy_html'}) || ($self->{'old_style_HDL'}))
+    if (($self->{'use_realistic_book'}) || ($self->{'old_style_HDL'}))
     {
     # because the document has to be sectionalized set the description tags 

gsdl/trunk/runtime-src/src/colservr/collectserver.cpp

@@ -1 @@
-
+ 
 /**********************************************************************
  *
@@ -60 +60 @@
 // configure should be called for each line in the
 // configuration files to configure the collection server and everything
-// it contains. The configuration should take place just before initialisationhttps://www.google.com/accounts/ServiceLogin?service=mail&passive=true&rm=false&continue=http%3A%2F%2Fmail.google.com%2Fmail%3Fui%3Dhtml%26zy%3Dl&ltmpl=ca_tlsosm_video&ltmplcache=2&hl=en.
+// it contains. The configuration should take place just before initialisation
 void collectserver::configure (const text_t &key, const text_tarray &cfgline) {
   if (cfgline.size() >= 1) {
@@ -69 +69 @@
     const text_t &name = cfgline[0];
     
-    if (name == "HTMLPlug")
+    if (name == "HTMLPlugin")
     {
         for (int hI = 1; hI < cfgline.size(); hI++)
@@ -75 +75 @@
             const text_t &plugOption = cfgline[hI];
             
-            if (plugOption == "-tidy_html") 
+            if (plugOption == "-use_realistic_book") 
             {
                 collectinfo.useBook = true;
@@ -166 +166 @@
       text_tmap params_map = collectinfo.collection_macros[meta_name];
       
-      if (cfgline.size() == 2) {// no params for this macrohttp://uk.sports.yahoo.com/13032007/13/news-brief.html
+      if (cfgline.size() == 2) {// no params for this macro
     params_map[g_EmptyText] = cfgline[1];
       }

gsdl/trunk/runtime-src/src/recpt/comproto.asn

@@ -216 +216 @@
   numDocs     [6] IMPLICIT INTEGER,
   numWords    [7] IMPLICIT INTEGER OPTIONAL,
-  numBytes    [8] IMPLICIT INTEGER OPTIONAL
+  numBytes    [8] IMPLICIT INTEGER OPTIONAL,
+  useBook     [9] IMPLICIT BOOLEAN     -- whether to use book mode
 }
 

gsdl/trunk/runtime-src/src/recpt/statusaction.cpp

@@ -579 +579 @@
           << "</td></tr>\n"
 
+          << "<tr><th>use realistic book?</th><td>";
+      if (collectinfo->useBook) textout << outconvert << "true";
+      else textout << outconvert << "false";
+      textout << outconvert 
+          << "</td></tr>\n"
+          
           << "<tr><th>build date</th><td>\""
           << collectinfo->buildDate

gsdl/trunk/runtime-src/src/z3950/z3950proto.cpp

@@ -246 +246 @@
   // don't use beta field
   /*collectinfo.isBeta=false;*/
+  collectinfo.useBook=false;
   collectinfo.buildDate=1;
   // leave ccsCols empty (no cross-coll. searching - for now)