Changeset 58 for trunk/gsdl/src/library

Timestamp:

1998-12-07T11:50:25+13:00 (26 years ago)

Author:

sjboddie

Message:

added niupepa collection and made allowances in libinterface for 'auxiliary' actions for those things that don't fit into 'document' action

Location:

trunk/gsdl/src/library

Files:

• browse.cpp (modified) (3 diffs)
• gdbmclass.cpp (modified) (1 diff)
• libinterface.cpp (modified) (4 diffs)
• libinterface.h (modified) (1 diff)

trunk/gsdl/src/library/browse.cpp

@@ -434 +434 @@
       } else {
     if (!info.c.empty()) {
-      (info.c, firstcontent);
+      get_first_section(info.c, firstcontent);
       return_text += link + *here + "." + firstcontent + "\">";
       return_text += info.t + "</a>&nbsp;&nbsp;&nbsp;";
@@ -735 +735 @@
 
 // sorts an array of sections alphabetically (i.e. by title, author depending
-// on what classification is)
+// on what classification is) or by date
 void browseclass::sort_array (vector<text_t> &array, gdbmclass &gdbm, 
                   const text_t &collection, const text_t classification) {
+
+  if ((classification[0] != 'T') && (classification[0] != 'A') &&
+      (classification[0] != 'D')) return;
 
   gdbm_info info;
@@ -759 +762 @@
       tmparray = string_add(tmparray, &len, info.t.getcstr());
 
-    } else {
+    } else if (classification[0] == 'A') {
       alphabetize_string_name(info.a);
       info.a += ":#:" + *here;
       tmparray = string_add(tmparray, &len, info.a.getcstr());
+   
+    } else {
+      info.i += ":#:" + *here;
+      tmparray = string_add(tmparray, &len, info.i.getcstr());
     }
     here ++;

trunk/gsdl/src/library/gdbmclass.cpp

@@ -711 +711 @@
 
 static int compare_str (const void *e1, const void *e2) {
-  return my_stricmp(*((char**)e1), *((char**)e2));
+  return _stricmp(*((char**)e1), *((char**)e2));
 }
 

trunk/gsdl/src/library/libinterface.cpp

@@ -240 +240 @@
   else if (arg_a == "t") document_action (args, textout, logout);
   else if (arg_a == "p") page_action (args, textout, logout);
+  else if ((arg_a.size() == 2) && (arg_a[0] == 'a')) auxiliary_action (args, textout, logout);
   else 
     {
@@ -256 +257 @@
 {
   argconfigstr = 
-    "a[p]"     // action: q=query, b=browse, t=targetdoc, p=page
+    "+a[p]"    // action: q=query, b=browse, t=targetdoc, p=page, a1=auxiliary
     "t[1]"     // query type: 0=boolean, 1=ranked
     "i[c]"     // index: c=chapter, p=paragraph, t=title, b=book
@@ -262 +263 @@
     "s[0]"     // stemming: 0=off, 1=on
     "+p[home]" // page
-    "+c[unu2]" // collection
+    "+c[unu]"  // collection
     "+r[1]"    // results from
     "+d[C.1]"  // the target document
@@ -865 +866 @@
 
 /////////////////////////////////////////////////////////////////////////////////////////
+// auxiliary_action is called to retrieve and display collection documents
+// in formats other than those handled by document_action (i.e. those other
+// than text). This should be overridden for collections needing to return
+// images, postscript etc. You can have as many auxiliary actions as needed
+// by setting arg_a to a1, a2, a3 etc. and testing arg["a"][1] within the 
+// auxiliary_action function.
+// auxiliary_action defaults to calling document_action
+
+void libinterface::auxiliary_action (cgiargsclass &args, ostream &textout, ostream &logout) {
+  document_action (args, textout, logout);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
 // page is called when a standard html page is to be displayed
 void libinterface::page_action (cgiargsclass &args, ostream &textout, ostream &logout)

trunk/gsdl/src/library/libinterface.h

@@ -119 +119 @@
   virtual void document_action (cgiargsclass &args, ostream &textout, ostream &logout);
   virtual void page_action (cgiargsclass &args, ostream &textout, ostream &logout);
+  virtual void auxiliary_action (cgiargsclass &args, ostream &textout, ostream &logout);
   
   virtual void displayresults (cgiargsclass &args, ostream &textout, ostream &logout,