Changeset 18895 for gsdl/trunk/runtime-src/src/oaiservr/metaformat.h

Timestamp:

2009-04-06T13:18:45+12:00 (15 years ago)

Author:

kjdon

Message:

added is_valid_element to metaformat, which checks elementSet for the element name. metaformat subclass constructors must set up elementSet. Currently they do this in the code. would be good if it could read in from a file eventually, maybe?? When metaformat is outputting the m,etadata, it checks whether the element is valid before outputting. otherwise it will invalidate the response as it won't conform to the schema. also, changed where we lowercased the entire name to lowercasing only the first letter - some qdc fields have an internal upper case letter.

File:

• gsdl/trunk/runtime-src/src/oaiservr/metaformat.h (modified) (2 diffs)

gsdl/trunk/runtime-src/src/oaiservr/metaformat.h

@@ -19 +19 @@
  protected:
   virtual void output_metadata_header(ostream &output) = 0;
-  virtual void output_item(ostream &output, outconvertclass &outconvert, bool &headerDone, const text_t &label, 
+  virtual void output_item(ostream &output, outconvertclass &outconvert, 
+               bool &headerDone, const text_t &label, 
                const text_tarray &values);
   virtual void output_metadata_footer(ostream &output) = 0;
-  virtual bool scan_metadata(ostream &output, const text_t &collection,  ResultDocInfo_t &docInfo, 
-                 bool doOutput);
+  virtual bool is_valid_element(text_t &meta_name);
+  virtual bool scan_metadata(ostream &output, const text_t &collection,  
+                 ResultDocInfo_t &docInfo, bool doOutput);
   oaiconfig *    oaiConfigure;
+
+  // a set containing all the valid element names for the set. Must be 
+  // initialized by each metadata class
+  text_tset elementSet; 
 
  public:
@@ -30 +36 @@
   virtual const text_t formatName() = 0;
   virtual const text_t formatPrefix() = 0;
-  virtual bool output_record(ostream &output, recptproto *protocol, const text_t &collection, 
+  virtual bool output_record(ostream &output, recptproto *protocol, 
+                 const text_t &collection, 
                  const text_t &record_OID);
   virtual bool is_available(const text_t &collection, ResultDocInfo_t &docInfo);
-  virtual bool output_metadata(ostream &output, const text_t &collection,  ResultDocInfo_t &docInfo);
+  virtual bool output_metadata(ostream &output, const text_t &collection,  
+                   ResultDocInfo_t &docInfo);
   virtual bool output_formatdata(ostream &output) = 0;
   void    set_configuration(oaiconfig *config) { this->oaiConfigure = config; }