Changeset 712

Timestamp:

1999-10-19T09:07:05+13:00 (25 years ago)

Author:

sjboddie

Message:

tidied up a few things - moved processing of "hp" argument
to htmlbrowserclass

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (6 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.35  1999/10/18 20:07:05  sjboddie
+   tidied up a few things - moved processing of "hp" argument
+   to htmlbrowserclass
+
    Revision 1.34  1999/10/14 23:00:52  sjboddie
    finished changes to browsing support
@@ -859 +863 @@
       metadata.insert ("childtype");
       if (get_info (OIDs, args["c"], metadata, false, collectproto, response, logout)) {
-    text_t classifytype = response.docInfo[0].metadata["childtype"].values[0];
-    if (classifytype.empty()) 
-      classifytype = response.docInfo[1].metadata["childtype"].values[0];
+    text_t classifytype;
+    MetadataInfo_tmap::iterator it = response.docInfo[0].metadata.find ("childtype");
+    if (it != response.docInfo[0].metadata.end())
+      classifytype = (*it).second.values[0];
+    else {
+      it = response.docInfo[1].metadata.find ("childtype");
+      if (it != response.docInfo[1].metadata.end())   
+        classifytype = (*it).second.values[0];
+    }
     browserclass *b = browsers.getbrowser (classifytype);
     b->processOID (args, collectproto, logout);
@@ -867 +877 @@
     }
 
-    // translate "d", "cl", and "hp" arguments if required
+    // translate "d" and "cl" arguments if required
     translate_OIDs (args, collectproto, logout);
   }
@@ -1012 +1022 @@
 }
 
-// translate_OIDs translates the "d", "cl", and "hp" arguments to their correct values
+// translate_OIDs translates the "d" and "cl" arguments to their correct values
 // if they use the tricky ".fc", ".lc" type syntax.
 void receptionist::translate_OIDs (cgiargsclass &args, recptproto *collectproto, 
@@ -1022 +1032 @@
   text_t &arg_d = args["d"];
   text_t &arg_cl = args["cl"];
-  text_t &arg_hp = args["hp"];
   text_t &collection = args["c"];
   
@@ -1046 +1055 @@
     else
       arg_cl = response.docInfo[0].OID;
-  }
-
-  if (needs_translating (arg_hp)) {
-    request.docSet.push_back (arg_hp);
-    collectproto->filter (collection, request, response, err, logout);
-    arg_hp = response.docInfo[0].OID;
   }
 }