Changeset 13982

Timestamp:

2007-03-15T13:21:55+13:00 (17 years ago)

Author:

lh92

Message:

Added UseBook variable for Realistic Book

Location:

trunk/gsdl

Files:

• macros/pref.dm (modified) (1 diff)
• src/colservr/collectserver.cpp (modified) (2 diffs)
• src/colservr/corbaServer.mpp (modified) (1 diff)
• src/colservr/z3950explain.cpp (modified) (1 diff)
• src/recpt/comtypes.cpp (modified) (1 diff)
• src/recpt/comtypes.h (modified) (1 diff)
• src/recpt/corbaproto.mpp (modified) (1 diff)
• src/recpt/pageaction.cpp (modified) (1 diff)

trunk/gsdl/macros/pref.dm

@@ -569 +569 @@
 
 <tr>_formatoption_</tr>
-<tr>_bookoption_</tr>
+_If_("_tidyoption_" ne "untidy",<tr>_bookoption_</tr>)
 </table>
 </blockquote>

trunk/gsdl/src/colservr/collectserver.cpp

@@ -61 +61 @@
 // 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 initialisation.
+// 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.
 void collectserver::configure (const text_t &key, const text_tarray &cfgline) {
   if (cfgline.size() >= 1) {
     const text_t &value = cfgline[0];
-    if (key == "gsdlhome") configinfo.gsdlhome = value;
+    if (key == "plugin")
+    {
+        //get the plugin name
+    const text_t &name = cfgline[0];
+    
+    if (name == "HTMLPlug")
+    {
+        for (int hI = 1; hI < cfgline.size(); hI++)
+        {
+            const text_t &plugOption = cfgline[hI];
+            
+            if (plugOption == "-tidy_html") 
+            {
+                collectinfo.useBook = true;
+                break;
+            }
+        }
+    }
+    }
+    else if (key == "gsdlhome") configinfo.gsdlhome = value;
     else if (key == "gdbmhome") configinfo.gdbmhome = value;
     else if (key == "collection") {
@@ -143 +162 @@
       text_tmap params_map = collectinfo.collection_macros[meta_name];
       
-      if (cfgline.size() == 2) {// no params for this macro
+      if (cfgline.size() == 2) {// no params for this macrohttp://uk.sports.yahoo.com/13032007/13/news-brief.html
     params_map[g_EmptyText] = cfgline[1];
       }

trunk/gsdl/src/colservr/corbaServer.mpp

@@ -268 +268 @@
     cout << "NumBytes  = " << response.numBytes << endl;
     cout << "NumWords  = " << response.numWords << endl;
-
+    cout << "UseBook   = " << ((response.useBook)  ?"True":"False") << endl;
+    
+    corbaResponse.useBook   = response.useBook;
     corbaResponse.isPublic  = response.isPublic;
     corbaResponse.isBeta    = response.isBeta;

trunk/gsdl/src/colservr/z3950explain.cpp

@@ -101 +101 @@
     docinfo.metadata["isBeta"].values.push_back("false");
       }
+      if (collectinfo.useBook == true) {
+    docinfo.metadata["useBook"].values.push_back("true");
+      } else {
+    docinfo.metadata["useBook"].values.push_back("false");
+      }
       docinfo.metadata["buildDate"].values.push_back(collectinfo.buildDate);
       text_tarray::iterator TEXTT_HERE = collectinfo.ccsCols.begin();

trunk/gsdl/src/recpt/comtypes.cpp

@@ -51 +51 @@
 void ColInfoResponse_t::clear () {
   shortInfo.clear();
+  useBook=false;
   isPublic=true;
   isBeta=false;

trunk/gsdl/src/recpt/comtypes.h

@@ -84 +84 @@
   
   ShortColInfo_t shortInfo;
+  bool useBook; //whether we want to display the book
   bool isPublic;
   bool isBeta;

trunk/gsdl/src/recpt/corbaproto.mpp

@@ -582 +582 @@
 
   // convert the response back to normal form
+  collectinfo.useBook = corbaCollectInfo.useBook;
   collectinfo.isPublic = corbaCollectInfo.isPublic;
   collectinfo.isBeta   = corbaCollectInfo.isBeta;

trunk/gsdl/src/recpt/pageaction.cpp

@@ -638 +638 @@
     cinfo = recpt->get_collectinfo_ptr (collectproto, arg_c, logout);
     
+    //set the tidyoption
+    if (cinfo->useBook == false)
+    {
+        disp.setmacro ("tidyoption", displayclass::defaultpackage, "untidy");
+    }
+    else
+    {
+        disp.setmacro ("tidyoption", displayclass::defaultpackage, "tidy");
+    }
+    
     disp.setmacro ("numdocs", displayclass::defaultpackage, cinfo->numDocs);
     disp.setmacro ("numsections", displayclass::defaultpackage, cinfo->numSections);