Changeset 15836

Timestamp:

2008-05-30T16:00:47+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Not sure if this is necessarily the best place to do this, but added the ability to request the documents from a "get_documents_with_metadata_value()" call to be sorted based on a certain metadata element. Thanks to John Thompson for the SQL statement help.

Location:

gsdl/trunk

Files:

• lib/sqldbclass.h (modified) (1 diff)
• lib/sqlitedbclass.cpp (modified) (2 diffs)
• lib/sqlitedbclass.h (modified) (1 diff)
• src/colservr/sqlbrowsefilter.cpp (modified) (2 diffs)
• src/protocol/recptprototools.cpp (modified) (2 diffs)
• src/protocol/recptprototools.h (modified) (1 diff)
• src/recpt/dynamicclassifieraction.cpp (modified) (1 diff)

gsdl/trunk/lib/sqldbclass.h

@@ -44 +44 @@
   // returns array of document OIDs
   virtual text_tarray get_documents_with_metadata_value (const text_t &metadata_element_name,
-                             const text_t &metadata_value) = 0;
+                             const text_t &metadata_value,
+                             const text_t &sort_by_metadata_element_name) = 0;
 
   // returns array of values

gsdl/trunk/lib/sqlitedbclass.cpp

@@ -100 +100 @@
 // returns array of document OIDs
 text_tarray sqlitedbclass::get_documents_with_metadata_value (const text_t &metadata_element_name,
-                                  const text_t &metadata_value)
+                                  const text_t &metadata_value,
+                                  const text_t &sort_by_metadata_element_name)
 {
   text_tarray document_OIDs;
@@ -111 +112 @@
 
   // Get the entries in the "document_metadata" table where the element and value matches those specified
-  text_t sql_cmd = "SELECT docOID FROM document_metadata WHERE element='" + metadata_element_name + "' AND value='" + metadata_value + "'";
+  text_t sql_cmd;
+  if (sort_by_metadata_element_name == "")
+  {
+    // No sorting required
+    sql_cmd = "SELECT docOID FROM document_metadata WHERE element='" + metadata_element_name + "' AND value='" + metadata_value + "'";
+  }
+  else
+  {
+    // Sort the documents by a certain metadata element
+    // John Thompson thinks this may not be the most efficient solution, and recommends using ON instead of WHERE
+    sql_cmd = "SELECT b.docOID FROM document_metadata AS a LEFT JOIN document_metadata AS b USING (docOID) WHERE a.element='" + metadata_element_name + "' AND a.value='" + metadata_value + "' AND b.element='" + sort_by_metadata_element_name + "' ORDER BY b.value";
+  }
   vector<text_tmap> sql_results;
   if (!sqlgetarray(sql_cmd, sql_results) || sql_results.size() == 0)

gsdl/trunk/lib/sqlitedbclass.h

@@ -47 +47 @@
   // returns array of document OIDs
   text_tarray get_documents_with_metadata_value (const text_t &metadata_element_name,
-                         const text_t &metadata_value);
+                         const text_t &metadata_value,
+                         const text_t &sort_by_metadata_element_name);
 
   // returns file extension string

gsdl/trunk/src/colservr/sqlbrowsefilter.cpp

@@ -160 +160 @@
     text_t metadata_element_name = "";
     text_t metadata_value = "";
+    text_t sort_by_metadata_element_name = "";
     OptionValue_tarray::const_iterator options_iterator = request.filterOptions.begin();
     while (options_iterator != request.filterOptions.end())
@@ -171 +172 @@
     metadata_value = (*options_iterator).value;
       }
+      if ((*options_iterator).name == "SortByMetadataElement")
+      {
+    sort_by_metadata_element_name = (*options_iterator).value;
+      }
       options_iterator++;
     }
 
-    text_tarray document_OIDs = sql_db_ptr->get_documents_with_metadata_value (metadata_element_name, metadata_value);
+    text_tarray document_OIDs = sql_db_ptr->get_documents_with_metadata_value (metadata_element_name, metadata_value, sort_by_metadata_element_name);
 
     // Fill in response.docInfo with the document OIDs

gsdl/trunk/src/protocol/recptprototools.cpp

@@ -284 +284 @@
 
 
-bool get_documents_with_metadata_value (const text_t metadata_element_name, const text_t metadata_value, 
-                    const text_t &collection, recptproto *collectproto,
-                    FilterResponse_t &response, ostream &logout)
+bool get_documents_with_metadata_value (const text_t metadata_element_name, const text_t metadata_value,
+                    const text_t sort_by_metadata_element_name, const text_t &collection,
+                    recptproto *collectproto, FilterResponse_t &response, ostream &logout)
 {
   response.clear();
@@ -304 +304 @@
   request_option.value = metadata_value;
   request.filterOptions.push_back (request_option);
+  request_option.name = "SortByMetadataElement";
+  request_option.value = sort_by_metadata_element_name;
+  request.filterOptions.push_back (request_option);
 
   assert (collectproto != NULL);

gsdl/trunk/src/protocol/recptprototools.h

@@ -71 +71 @@
               recptproto *collectproto, FilterResponse_t &response, ostream &logout);
 
-bool get_documents_with_metadata_value (const text_t metadata_element_name, const text_t metadata_value, 
-                    const text_t &collection, recptproto *collectproto,
-                    FilterResponse_t &response, ostream &logout);
+bool get_documents_with_metadata_value (const text_t metadata_element_name, const text_t metadata_value,
+                    const text_t sort_by_metadata_element_name, const text_t &collection,
+                    recptproto *collectproto, FilterResponse_t &response, ostream &logout);
 
 #endif

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -168 +168 @@
     text_t metadata_value = arg_dcn;
     FilterResponse_t document_OIDs_response;
-    get_documents_with_metadata_value (metadata_element_name, metadata_value, args["c"], collectproto, document_OIDs_response, logout);
+    get_documents_with_metadata_value (metadata_element_name, metadata_value, "dls.Title", args["c"], collectproto, document_OIDs_response, logout);
 
     // Check the metadata value is valid