Changeset 282 for trunk/gsdl/src/recpt

Timestamp:

1999-06-17T15:06:58+12:00 (25 years ago)

Author:

sjboddie

Message:

got detach button working properly - the close book icon is now disabled
when page is detached as the javascript close() function I was using is
too unreliable over different browsers
note that in my last comment I meant the "cl" arg (not the "c" arg).

Location:

trunk/gsdl/src/recpt

Files:

• browsetools.cpp (modified) (7 diffs)
• documentaction.cpp (modified) (5 diffs)

trunk/gsdl/src/recpt/browsetools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.8  1999/06/17 03:06:53  sjboddie
+   got detach button working properly - the close book icon is now disabled
+   when page is detached as the javascript close() function I was using is
+   too unreliable over different browsers
+   note that in my last comment I meant the "cl" arg (not the "c" arg).
+
    Revision 1.7  1999/06/16 23:53:14  sjboddie
    tidied a few things up. documentaction::define_external_macros now
@@ -218 +224 @@
     
     // detach button
-    buttons.push_back ("_imagedetach_");
+    buttons.push_back ("_document:imagedetach_");
 
     // highlighting button
     if (args["hl"] == "1") 
-      buttons.push_back ("_imagenohighlight_");
+      buttons.push_back ("_document:imagenohighlight_");
     else 
-      buttons.push_back ("_imagehighlight_");
+      buttons.push_back ("_document:imagehighlight_");
 
     // expand/contract contents button - only have this if it's
@@ -232 +238 @@
       if (response.docInfo[0].metadata[0].values[0] == "Hierarchy") 
     if (args["gc"] == "1")
-      buttons.push_back ("_imagecontracttoc_");
+      buttons.push_back ("_document:imagecontracttoc_");
     else 
-      buttons.push_back ("_imageexpandtoc_");
+      buttons.push_back ("_document:imageexpandtoc_");
     }
     
     // expand/contract text button
     if (args.getintarg("gt"))
-      buttons.push_back ("_imagecontracttext_");
+      buttons.push_back ("_document:imagecontracttext_");
     else 
-      buttons.push_back ("_imageexpandtext_");
+      buttons.push_back ("_document:imageexpandtext_");
 
     text_tarray::const_iterator here = buttons.begin();
@@ -472 +478 @@
     if ((classifytype == "Document") && (is_top((*thissection).OID)) && 
     (args.getintarg("x")))
-      textout << "<a href=\"\" onClick = \"close_detach();\">";
+      textout << outconvert << disp << icon << "</td><td";
+
     else {
       if (!gt) {
@@ -504 +511 @@
     count ++;
       }
-    }
-    
-    textout << outconvert << disp << icon << "</a></td><td";
+    
+      textout << outconvert << disp << icon << "</a></td><td";
+    }
     if (colsremaining > 1) textout << " colspan=" << colsremaining;
     textout << outconvert << disp << ">" << title << "</td></tr>\n";
@@ -567 +574 @@
       tabcount ++;
       
+      textout << outconvert << disp << "<tr>" << tab << "<td valign=top>";
+
       if (is_top(*thisparent) && args["x"] == "1") {
-    textout << outconvert << disp << "<tr>" << tab << "<td valign=top><a href=\"\" "
-        << "onClick = \"close_detach()\">" << icon << "</a></td>";
+    textout << outconvert << disp << icon;
       } else {
     text_t link;
@@ -583 +591 @@
       else link = doclink + "&cl=" + arg_cl + "&d=" + *thisparent + ".pr\">";
 
-    textout << outconvert << disp << "<tr>" << tab << "<td valign=top>" 
-        << link << icon << "</a></td>";
+    textout << outconvert << disp << link << icon << "</a>";
       }
-      textout << "<td"; 
+      textout << "</td><td"; 
       if (colnum > 1) textout << outconvert << " colspan=" << text_t(colnum);
       textout << outconvert << disp << ">" << title << "</td></tr>\n";

trunk/gsdl/src/recpt/documentaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.7  1999/06/17 03:06:58  sjboddie
+   got detach button working properly - the close book icon is now disabled
+   when page is detached as the javascript close() function I was using is
+   too unreliable over different browsers
+   note that in my last comment I meant the "cl" arg (not the "c" arg).
+
    Revision 1.6  1999/06/16 23:53:15  sjboddie
    tidied a few things up. documentaction::define_external_macros now
@@ -131 +137 @@
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "0";
-  arg_ainfo.savedarginfo = cgiarginfo::can;
+  arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, arg_ainfo);
 }
@@ -240 +246 @@
   }
 
-  get_top (arg_cl, topparent);
-
-  collectproto->get_filterinfo (collection, filterinfo, err, logout);
-  if (err == noError) {
-    // check that there's a browse filter
-    if (filterinfo.filterNames.find ("BrowseFilter") != filterinfo.filterNames.end()) {
-      
-      metadata.push_back ("Title");
-      metadata.push_back ("classifytype");
-      get_children ("", collection, metadata, collectproto, response, logout);
-
-      // don't do anything unless there are classifications
-      if (!response.docInfo.empty()) {
-
-    ResultDocInfo_tarray::const_iterator dochere = response.docInfo.begin();
-    ResultDocInfo_tarray::const_iterator docend = response.docInfo.end();
+  // don't want navigation bar if page is 'detached'
+  if (!args.getintarg("x")) {
+
+    get_top (arg_cl, topparent);
+    
+    collectproto->get_filterinfo (collection, filterinfo, err, logout);
+    if (err == noError) {
+      // check that there's a browse filter
+      if (filterinfo.filterNames.find ("BrowseFilter") != filterinfo.filterNames.end()) {
     
-    navigationbar = "<!-- Navigation Bar -->\n";
+    metadata.push_back ("Title");
+    metadata.push_back ("classifytype");
+    get_children ("", collection, metadata, collectproto, response, logout);
+    
+    // don't do anything unless there are classifications
+    if (!response.docInfo.empty()) {
       
-    // calculate width of spacers and set macro
-    if (args.getintarg("v") == 0) {
-      disp.expandstring ("Global", "_pagewidth_", width);
-      twidth = width.getint();
+      ResultDocInfo_tarray::const_iterator dochere = response.docInfo.begin();
+      ResultDocInfo_tarray::const_iterator docend = response.docInfo.end();
       
-      disp.expandstring ("query", "_searchwidth_", width);
-      iwidth += width.getint();
+      navigationbar = "<!-- Navigation Bar -->\n";
       
+      // calculate width of spacers and set macro
+      if (args.getintarg("v") == 0) {
+        disp.expandstring ("Global", "_pagewidth_", width);
+        twidth = width.getint();
+        
+        disp.expandstring ("query", "_searchwidth_", width);
+        iwidth += width.getint();
+        
+        while (dochere != docend) {
+          disp.expandstring ("document", "_" + (*dochere).metadata[0].values[0] + "width_", width);
+          iwidth += width.getint();
+          dochere ++;
+        }
+        if ((twidth - iwidth) < int(response.docInfo.size())) swidth = 2;
+        else swidth = (twidth - iwidth) / response.docInfo.size();
+        disp.setmacro ("widthtspace", "Global", swidth);
+      }
+      
+      navigationbar += "<nobr>\n";
+      if (args["a"] == "q") {
+        navigationbar += "_icontabsearchgreen_";
+      } else {
+        navigationbar += "_imagesearch_";
+        javaimagesnavbar = "_javasearch_";
+      }
+      dochere = response.docInfo.begin();
       while (dochere != docend) {
-        disp.expandstring ("document", "_" + (*dochere).metadata[0].values[0] + "width_", width);
-        iwidth += width.getint();
+        const text_t &title = (*dochere).metadata[0].values[0];
+        const text_t &classifytype = (*dochere).metadata[1].values[0];
+        
+        // if we're inside a document all the classification buttons should be enabled
+        if (arg_d.empty() && ((*dochere).OID == topparent))
+          navigationbar += "_imagespacer__icontab" + title + "green_";
+        else {
+          navigationbar += "_imagespacer__image" + title + "_";
+          
+          // set the _httpbrowseXXX_ macro for this classification
+          text_t link = (*dochere).OID;
+          if (classifytype == "AZList" || classifytype == "Datelist") link += ".fc";
+          disp.setmacro ("httpbrowse" + title, "Global", 
+                 "_httpdocument_&cl=" + link);
+        }
+        javaimagesnavbar += "_java" + title + "_";
         dochere ++;
       }
-      if ((twidth - iwidth) < int(response.docInfo.size())) swidth = 2;
-      else swidth = (twidth - iwidth) / response.docInfo.size();
-      disp.setmacro ("widthtspace", "Global", swidth);
+      navigationbar += "\n</nobr>\n";
+      navigationbar += "<!-- End of Navigation Bar -->\n";
+      disp.setmacro ("navigationbar", "Global", navigationbar);
+      if (args.getintarg("v") == 0) 
+        disp.setmacro ("javaimagesnavbar", "Global", javaimagesnavbar);
     }
-    
-    navigationbar += "<nobr>\n";
-    if (args["a"] == "q") {
-      navigationbar += "_icontabsearchgreen_";
-    } else {
-      navigationbar += "_imagesearch_";
-      javaimagesnavbar = "_javasearch_";
-    }
-    dochere = response.docInfo.begin();
-    while (dochere != docend) {
-      const text_t &title = (*dochere).metadata[0].values[0];
-      const text_t &classifytype = (*dochere).metadata[1].values[0];
-
-      // if we're inside a document all the classification buttons should be enabled
-      if (arg_d.empty() && ((*dochere).OID == topparent))
-        navigationbar += "_imagespacer__icontab" + title + "green_";
-      else {
-        navigationbar += "_imagespacer__image" + title + "_";
-
-        // set the _httpbrowseXXX_ macro for this classification
-        text_t link = (*dochere).OID;
-        if (classifytype == "AZList" || classifytype == "Datelist") link += ".fc";
-        disp.setmacro ("httpbrowse" + title, "Global", 
-               "_httpdocument_&cl=" + link);
-      }
-      javaimagesnavbar += "_java" + title + "_";
-      dochere ++;
-    }
-    navigationbar += "\n</nobr>\n";
-    navigationbar += "<!-- End of Navigation Bar -->\n";
-    disp.setmacro ("navigationbar", "Global", navigationbar);
-    if (args.getintarg("v") == 0) 
-      disp.setmacro ("javaimagesnavbar", "Global", javaimagesnavbar);
-      }
-    }
-  } else {
-    logout << text_t2ascii 
-       << "Error (documentaction::define_external_macros()) in call to get_filterinfo() " 
-       << get_comerror_string (err);
+      }
+    } else {
+      logout << text_t2ascii 
+         << "Error (documentaction::define_external_macros()) in call to get_filterinfo() " 
+         << get_comerror_string (err);
+    }
   }
 }
@@ -326 +336 @@
   // define_internal_macros sets the following macros:
 
+  // _random_               a random number - used for setting target tags to display
+  //                        a random page when you hit the 'detach' button
+
   // _pagetitle_            the title to be displayed at the top of the browser window
   
@@ -347 +360 @@
   if (collectproto == NULL) return;
 
+  disp.setmacro("random", "document", rand());
   
   text_tarray metadata;