Changeset 278 for trunk/gsdl/src/recpt

Timestamp:

1999-06-16T15:11:25+12:00 (25 years ago)

Author:

sjboddie

Message:

get_info() now takes a getParents argument

Location:

trunk/gsdl/src/recpt

Files:

• OIDtools.cpp (modified) (5 diffs)
• OIDtools.h (modified) (1 diff)
• browsetools.cpp (modified) (10 diffs)

trunk/gsdl/src/recpt/OIDtools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.8  1999/06/16 03:11:25  sjboddie
+   get_info() now takes a getParents argument
+
    Revision 1.7  1999/06/16 02:05:23  sjboddie
    just changed a comment that was confusing me
@@ -95 +98 @@
 
 bool get_info (const text_t &OID, const text_t &collection,
-           const text_tarray &metadata, recptproto *collectproto,
-           FilterResponse_t &response, ostream &logout) {
+           const text_tarray &metadata, bool getParents,
+           recptproto *collectproto,FilterResponse_t &response, 
+           ostream &logout) {
 
   response.clear();
@@ -105 +109 @@
   request.filterName = "NullFilter";
   request.filterResultOptions = FRmetadata;
+  request.getParents = getParents;
   request.fields = metadata;
   request.docSet.insert (OID);
@@ -128 +133 @@
   metadata.push_back ("haschildren");
 
-  if (get_info (OID, collection, metadata, collectproto,
-        response, logout)) {
+  if (get_info (OID, collection, metadata, false, collectproto, response, logout)) {
     if (response.docInfo[0].metadata[0].values[0] == "1")
       return true;
@@ -280 +284 @@
 
   // get topOIDs info
-  if (get_info (topOID, collection, metadata, collectproto, response, logout))
+  if (get_info (topOID, collection, metadata, false, collectproto, response, logout))
       recurse_contents (response.docInfo[0], classify, totalcols, collection, 
             metadata, collectproto, response, logout);

trunk/gsdl/src/recpt/OIDtools.h

@@ -32 +32 @@
 // metadata fields are to be requested
 bool get_info (const text_t &OID, const text_t &collection,
-           const text_tarray &metadata, recptproto *collectproto,
-           FilterResponse_t &response, ostream &logout);
+           const text_tarray &metadata, bool getParents,
+           recptproto *collectproto, FilterResponse_t &response, 
+           ostream &logout);
 
 // has_children returns true if OID has children

trunk/gsdl/src/recpt/browsetools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.5  1999/06/16 03:11:25  sjboddie
+   get_info() now takes a getParents argument
+
    Revision 1.4  1999/05/10 03:40:26  sjboddie
    lots of changes - slowly getting document action sorted out
@@ -52 +55 @@
   metadata.push_back ("Title");
   metadata.push_back ("hastxt");
-  if (get_info (args["d"], args["c"], metadata, collectproto, response, logout)) {
+  if (get_info (args["d"], args["c"], metadata, false, collectproto, response, logout)) {
      
     docinfo = response.docInfo[0];
@@ -66 +69 @@
     metadata.push_back ("Title");
     metadata.push_back ("Creator");
-    get_info (booktop, args["c"], metadata, collectproto, response, logout);
+    get_info (booktop, args["c"], metadata, false, collectproto, response, logout);
     title = response.docInfo[0].metadata[0].values[0];
     author = response.docInfo[0].metadata[1].values[0];
@@ -91 +94 @@
     get_top (args["d"], doctop);
     // get title of last sibling
-    if (get_info (doctop + ".lc", args["c"], metadata, collectproto, response, logout)) {
+    if (get_info (doctop + ".lc", args["c"], metadata, false, collectproto, response, logout)) {
       if (is_number (response.docInfo[0].metadata[0].values[0])) {
         textout << outconvert << disp << "_document:page_" << docinfo.metadata[0].values[0]
@@ -176 +179 @@
   text_t top;
   get_top (args["d"], top);
-  if (get_info (top, args["c"], metadata, collectproto,
-        response, logout)) {
+  if (get_info (top, args["c"], metadata, false, collectproto, response, logout)) {
 
     text_t &archivedir = response.docInfo[0].metadata[0].values[0];
@@ -215 +217 @@
     // a Hierarchy type toc
     metadata.push_back ("classifytype");
-    if (get_info (top, args["c"], metadata, collectproto,
-          response, logout)) {
+    if (get_info (top, args["c"], metadata, false, collectproto, response, logout)) {
       if (response.docInfo[0].metadata[0].values[0] == "Hierarchy") 
     if (args["gc"] == "1")
@@ -509 +510 @@
 
   while (thisparent != end) {
-    if (get_info (*thisparent, args["c"], metadata, collectproto,
-          response, logout)) {
+    if (get_info (*thisparent, args["c"], metadata, false, collectproto, response, logout)) {
       text_t &doctype = response.docInfo[0].metadata[0].values[0];
       text_t &title = response.docInfo[0].metadata[1].values[0];
@@ -659 +659 @@
   metadata.push_back ("hasprevious");
   // get "haschildren", "hasnext" and "hasprevious" metadata for OID
-  if (get_info (OID, collection, metadata, collectproto, response, logout)) {
+  if (get_info (OID, collection, metadata, false, collectproto, response, logout)) {
 
     text_t haschildren = response.docInfo[0].metadata[0].values[0];
@@ -674 +674 @@
       else {
     // see if parent has younger siblings
-    if (get_info (OID + ".pr", collection, metadata, collectproto, response, logout)) {
+    if (get_info (OID + ".pr", collection, metadata, false, collectproto, response, logout)) {
       if (response.docInfo[0].metadata[1].values[0] == "1")
         disp.setmacro ("httpnextarrow", "document", 
@@ -683 +683 @@
       if (hasprevious == "1") {
     // see if OIDs older sibling has children
-    if (get_info (OID + ".ps", collection, metadata, collectproto, response, logout)) {
+    if (get_info (OID + ".ps", collection, metadata, false, collectproto, response, logout)) {
       if (response.docInfo[0].metadata[0].values[0] == "1")
         disp.setmacro ("httpprevarrow", "document",