Changeset 1419 for trunk/gsdl/src/recpt/documentaction.cpp

Timestamp:

2000-08-17T17:07:43+12:00 (24 years ago)

Author:

sjboddie

Message:

Added collector action - also changed the javascript required by all the
rollover buttons

File:

• trunk/gsdl/src/recpt/documentaction.cpp (modified) (9 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -256 +256 @@
 }
 
-// set_navbarmacros sets _navigationbar_, _javaimagesnavbar_ and _httpbrowseXXX_ macros
+// set_navbarmacros sets _navigationbar_ and _httpbrowseXXX_ macros
 // reponse contains 1 metadata field (Title)
 void documentaction::set_navbarmacros (displayclass &disp, FilterResponse_t &response, 
                        cgiargsclass &args) {
 
-  text_t javaimagesnavbar, topparent;
+  text_t topparent;
   text_t &arg_d = args["d"];
   text_t navigationbar = "<!-- Navigation Bar -->\n";
@@ -275 +275 @@
   } else {
     navigationbar += "_imagesearch_";
-    javaimagesnavbar = "_javasearch_";
   }
   
@@ -307 +306 @@
       }
     }
-    if (!unknown) javaimagesnavbar += "_java" + title + "_";
     dochere ++;
   }
@@ -313 +311 @@
   navigationbar += "<!-- End of Navigation Bar -->\n";
   disp.setmacro ("navigationbar", "Global", navigationbar);
-  if (args.getintarg("v") == 0)
-    disp.setmacro ("javaimagesnavbar", "Global", javaimagesnavbar);
 }
 
@@ -333 +329 @@
   //                     are Title and Creator classifications _httpbrowseTitle_
   //                     and _httpbrowseCreator_ will be set
-
-  // _javaimagesnavbar_  this is the javascript code to shove in to make the 
-  //                     flashy images used by _navigationbar_ work
 
   // _widthtspace_       the width of the spacers between buttons in navigation
@@ -414 +407 @@
     if (args.getintarg("v") == 0) set_spacemacro (disp, response);
 
-    // set _navigationbar_ and _javaimagesnavbar_ macros
+    // set _navigationbar_ macro
     set_navbarmacros (disp, response, args);
    
@@ -511 +504 @@
 }
 
-void documentaction::set_java_macros (cgiargsclass &args, displayclass &disp) {
-
-  text_t javaimagescontent = "_javaextras_";
-    
-  int arg_gt = args.getintarg("gt");
-  int arg_gc = args.getintarg("gc");
-  int arg_hl = args.getintarg("hl");
-
-  text_tarray::const_iterator button_here = formatinfo.DocumentButtons.begin();
-  text_tarray::const_iterator button_end = formatinfo.DocumentButtons.end();
-
-  while (button_here != button_end) {
-    if (*button_here == "Detach") 
-      javaimagescontent += "_javadetach_";
-    else if (*button_here == "Expand Text") {
-      if (arg_gt == 1)
-    javaimagescontent += "_javacontracttext__javacontinue_";
-      else if (arg_gt == 2)
-    javaimagescontent += "_javacontracttext_";
-      else
-    javaimagescontent += "_javaexpandtext_";
-    } else if (*button_here == "Expand Contents") {
-      if (arg_gc == 1)
-    javaimagescontent += "_javacontractcontents_";
-      else
-    javaimagescontent += "_javaexpandcontents_";
-    } else if (*button_here == "Highlight") {
-      if (arg_hl == 1)
-    javaimagescontent += "_javanohighlighting_";
-      else 
-    javaimagescontent += "_javahighlighting_";
-    }
-    button_here ++;
-  }
-  disp.setmacro ("javaimagescontent", "document", javaimagescontent);
-}
-
 
 // define all the macros which are related to pages generated
@@ -566 +522 @@
   // _header_               the header macro is overridden if we're not at a top level 
   //                        classification to remove the title block
-
-  // _javaimagescontent_    this is the javascript code to shove in to make the 
-  //                        flashy buttons work
 
   // _thisOID_              the OID (directory) of the current document - this corresponds
@@ -645 +598 @@
     disp.setmacro ("thisOID", "Global", dm_safe(thisOID));
       }
-      
-      if (args["u"] != "1")
-    set_java_macros (args, disp);
-
     }
   } else {