pho 0.3 → 0.4

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Fri, 13 Mar 2009 13:28:12 +0000
+Mon, 06 Apr 2009 16:00:04 +0100

data/doc/rdoc/files/CHANGES.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Mar 02 08:22:54 +0000 2009</td>
+      <td>Sat Apr 04 19:19:08 +0100 2009</td>
     </tr>
     </table>
   </div>
@@ -72,6 +72,29 @@
       <p>
 Brief notes on significant changes and additions in each release
 </p>
+<h2>Version 0.4</h2>
+<ul>
+<li>Added support for reading Job lifecycle data exposed in Talis Platform
+Release 21
+
+</li>
+<li>Added constants for 2 new analysers added in Talis Platform Release 21
+
+</li>
+<li>Refactored job submission code to move methods from the Store class onto
+the Jobs and Job classes instead. This brings that code in line with the
+patterns used elsewhere
+
+</li>
+<li>Re-implemented snapshot reading code to use RDF/XML rather than scraping
+the HTML
+
+</li>
+<li>Added a fledgling command-line tool for working with the platform
+&quot;pho_store&quot;
+
+</li>
+</ul>
 <h2>Version 0.3</h2>
 <ul>
 <li>Added support for QueryProfiles, Facets

data/doc/rdoc/files/lib/pho/field_predicate_map_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sun Mar 01 16:50:42 +0000 2009</td>
+      <td>Mon Mar 23 16:49:48 +0000 2009</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/pho/job_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sun Feb 22 11:24:24 +0000 2009</td>
+      <td>Mon Apr 06 15:19:08 +0100 2009</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/pho/snapshot_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Tue Feb 24 17:02:33 +0000 2009</td>
+      <td>Fri Apr 03 19:09:15 +0100 2009</td>
     </tr>
     </table>
   </div>
@@ -74,6 +74,7 @@
 
       <div class="name-list">
       digest/md5&nbsp;&nbsp;
+      tmpdir&nbsp;&nbsp;
       </div>
     </div>
 

data/doc/rdoc/files/lib/pho/status_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Mar 02 08:21:59 +0000 2009</td>
+      <td>Tue Mar 31 17:41:16 +0100 2009</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/pho/store_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Thu Mar 05 18:02:36 +0000 2009</td>
+      <td>Mon Apr 06 16:00:01 +0100 2009</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/pho_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sun Mar 01 16:52:04 +0000 2009</td>
+      <td>Thu Apr 02 17:22:46 +0100 2009</td>
     </tr>
     </table>
   </div>
@@ -85,6 +85,7 @@
       pho/query_profile&nbsp;&nbsp;
       pho/status&nbsp;&nbsp;
       pho/facet&nbsp;&nbsp;
+      pho/job&nbsp;&nbsp;
       pho/rdf_collection&nbsp;&nbsp;
       </div>
     </div>

data/doc/rdoc/fr_class_index.html

@@ -30,6 +30,8 @@
     <a href="classes/Pho/FieldPredicateMap.html">Pho::FieldPredicateMap</a><br />
     <a href="classes/Pho/FieldWeighting.html">Pho::FieldWeighting</a><br />
     <a href="classes/Pho/Job.html">Pho::Job</a><br />
+    <a href="classes/Pho/JobUpdate.html">Pho::JobUpdate</a><br />
+    <a href="classes/Pho/Jobs.html">Pho::Jobs</a><br />
     <a href="classes/Pho/Namespaces.html">Pho::Namespaces</a><br />
     <a href="classes/Pho/QueryProfile.html">Pho::QueryProfile</a><br />
     <a href="classes/Pho/RDFCollection.html">Pho::RDFCollection</a><br />

data/doc/rdoc/fr_method_index.html

@@ -20,99 +20,116 @@
 <div id="index">
   <h1 class="section-bar">Methods</h1>
   <div id="index-entries">
-    <a href="classes/Pho/QueryProfile.html#M000027"><< (Pho::QueryProfile)</a><br />
     <a href="classes/Pho/FieldPredicateMap.html#M000008"><< (Pho::FieldPredicateMap)</a><br />
-    <a href="classes/Pho/Etags.html#M000090">add (Pho::Etags)</a><br />
-    <a href="classes/Pho/Etags.html#M000091">add_from_response (Pho::Etags)</a><br />
-    <a href="classes/Pho/Store.html#M000052">augment (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000051">augment_uri (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000058">build_job_request (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000038">build_uri (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000053">configure_headers_for_conditional_get (Pho::Store)</a><br />
+    <a href="classes/Pho/QueryProfile.html#M000027"><< (Pho::QueryProfile)</a><br />
+    <a href="classes/Pho/Etags.html#M000107">add (Pho::Etags)</a><br />
+    <a href="classes/Pho/Etags.html#M000108">add_from_response (Pho::Etags)</a><br />
+    <a href="classes/Pho/Store.html#M000062">augment (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000061">augment_uri (Pho::Store)</a><br />
+    <a href="classes/Pho/Snapshot.html#M000081">backup (Pho::Snapshot)</a><br />
+    <a href="classes/Pho/Jobs.html#M000040">build_job_request (Pho::Jobs)</a><br />
+    <a href="classes/Pho/Store.html#M000048">build_uri (Pho::Store)</a><br />
+    <a href="classes/Pho/Job.html#M000087">completed? (Pho::Job)</a><br />
+    <a href="classes/Pho/Store.html#M000063">configure_headers_for_conditional_get (Pho::Store)</a><br />
     <a href="classes/Pho/FieldPredicateMap.html#M000006">create_mapping (Pho::FieldPredicateMap)</a><br />
     <a href="classes/Pho/QueryProfile.html#M000025">create_weighting (Pho::QueryProfile)</a><br />
-    <a href="classes/Pho/Store.html#M000056">delete_item (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000042">describe (Pho::Store)</a><br />
-    <a href="classes/Pho/Snapshot.html#M000073">download (Pho::Snapshot)</a><br />
-    <a href="classes/Pho/Store.html#M000049">facet (Pho::Store)</a><br />
-    <a href="classes/Pho/RDFCollection.html#M000082">failures (Pho::RDFCollection)</a><br />
-    <a href="classes/Pho/Etags.html#M000092">get (Pho::Etags)</a><br />
-    <a href="classes/Pho/FieldPredicateMap.html#M000013">get_by_name (Pho::FieldPredicateMap)</a><br />
+    <a href="classes/Pho/Store.html#M000066">delete_item (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000052">describe (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000059">facet (Pho::Store)</a><br />
+    <a href="classes/Pho/RDFCollection.html#M000099">failures (Pho::RDFCollection)</a><br />
+    <a href="classes/Pho/Etags.html#M000109">get (Pho::Etags)</a><br />
     <a href="classes/Pho/QueryProfile.html#M000028">get_by_name (Pho::QueryProfile)</a><br />
+    <a href="classes/Pho/FieldPredicateMap.html#M000013">get_by_name (Pho::FieldPredicateMap)</a><br />
     <a href="classes/Pho/FieldPredicateMap.html#M000014">get_by_uri (Pho::FieldPredicateMap)</a><br />
-    <a href="classes/Pho/RDFCollection.html#M000086">get_fail_file_for (Pho::RDFCollection)</a><br />
-    <a href="classes/Pho/Store.html#M000066">get_field_predicate_map (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000057">get_item (Pho::Store)</a><br />
+    <a href="classes/Pho/RDFCollection.html#M000103">get_fail_file_for (Pho::RDFCollection)</a><br />
+    <a href="classes/Pho/Store.html#M000073">get_field_predicate_map (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000067">get_item (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000068">get_job (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000069">get_jobs (Pho::Store)</a><br />
     <a href="classes/Pho/FieldPredicateMap.html#M000009">get_name (Pho::FieldPredicateMap)</a><br />
-    <a href="classes/Pho/RDFCollection.html#M000087">get_ok_file_for (Pho::RDFCollection)</a><br />
+    <a href="classes/Pho/RDFCollection.html#M000104">get_ok_file_for (Pho::RDFCollection)</a><br />
     <a href="classes/Pho/FieldPredicateMap.html#M000010">get_property_uri (Pho::FieldPredicateMap)</a><br />
-    <a href="classes/Pho/Store.html#M000068">get_query_profile (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000050">get_search_params (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000065">get_snapshots (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000064">get_status (Pho::Store)</a><br />
-    <a href="classes/Pho/Etags.html#M000093">has_tag? (Pho::Etags)</a><br />
-    <a href="classes/Pho/RDFCollection.html#M000081">list (Pho::RDFCollection)</a><br />
-    <a href="classes/Pho/QueryProfile.html#M000031">mapped_name? (Pho::QueryProfile)</a><br />
+    <a href="classes/Pho/Store.html#M000075">get_query_profile (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000060">get_search_params (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000072">get_snapshots (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000071">get_status (Pho::Store)</a><br />
+    <a href="classes/Pho/Etags.html#M000110">has_tag? (Pho::Etags)</a><br />
+    <a href="classes/Pho/RDFCollection.html#M000098">list (Pho::RDFCollection)</a><br />
     <a href="classes/Pho/FieldPredicateMap.html#M000011">mapped_name? (Pho::FieldPredicateMap)</a><br />
+    <a href="classes/Pho/QueryProfile.html#M000031">mapped_name? (Pho::QueryProfile)</a><br />
     <a href="classes/Pho/FieldPredicateMap.html#M000012">mapped_uri? (Pho::FieldPredicateMap)</a><br />
-    <a href="classes/Pho/RDFCollection.html#M000077">new (Pho::RDFCollection)</a><br />
-    <a href="classes/Pho/Store.html#M000036">new (Pho::Store)</a><br />
-    <a href="classes/Pho/Status.html#M000020">new (Pho::Status)</a><br />
-    <a href="classes/Pho/DatatypeProperty.html#M000034">new (Pho::DatatypeProperty)</a><br />
-    <a href="classes/Pho/Etags.html#M000088">new (Pho::Etags)</a><br />
-    <a href="classes/Pho/FieldWeighting.html#M000075">new (Pho::FieldWeighting)</a><br />
-    <a href="classes/Pho/QueryProfile.html#M000026">new (Pho::QueryProfile)</a><br />
     <a href="classes/Pho/FieldPredicateMap.html#M000007">new (Pho::FieldPredicateMap)</a><br />
+    <a href="classes/Pho/Job.html#M000082">new (Pho::Job)</a><br />
+    <a href="classes/Pho/RDFCollection.html#M000094">new (Pho::RDFCollection)</a><br />
+    <a href="classes/Pho/Status.html#M000020">new (Pho::Status)</a><br />
+    <a href="classes/Pho/FieldWeighting.html#M000092">new (Pho::FieldWeighting)</a><br />
+    <a href="classes/Pho/DatatypeProperty.html#M000044">new (Pho::DatatypeProperty)</a><br />
     <a href="classes/Pho/Facet/Term.html#M000004">new (Pho::Facet::Term)</a><br />
-    <a href="classes/Pho/Snapshot.html#M000071">new (Pho::Snapshot)</a><br />
+    <a href="classes/Pho/Store.html#M000046">new (Pho::Store)</a><br />
+    <a href="classes/Pho/Etags.html#M000105">new (Pho::Etags)</a><br />
+    <a href="classes/Pho/Snapshot.html#M000079">new (Pho::Snapshot)</a><br />
+    <a href="classes/Pho/QueryProfile.html#M000026">new (Pho::QueryProfile)</a><br />
     <a href="classes/Pho/Facet/Results.html#M000001">new (Pho::Facet::Results)</a><br />
-    <a href="classes/Pho/RDFCollection.html#M000084">new_files (Pho::RDFCollection)</a><br />
-    <a href="classes/Pho/Snapshot.html#M000070">parse (Pho::Snapshot)</a><br />
+    <a href="classes/Pho/RDFCollection.html#M000101">new_files (Pho::RDFCollection)</a><br />
     <a href="classes/Pho/Facet/Results.html#M000003">parse (Pho::Facet::Results)</a><br />
-    <a href="classes/Pho/Job.html#M000074">parse_jobs (Pho::Job)</a><br />
-    <a href="classes/Pho/Store.html#M000067">put_field_predicate_map (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000069">put_query_profile (Pho::Store)</a><br />
-    <a href="classes/Pho/Facet/Results.html#M000002">read_from_store (Pho::Facet::Results)</a><br />
+    <a href="classes/Pho/Job.html#M000084">parse (Pho::Job)</a><br />
+    <a href="classes/Pho/Snapshot.html#M000078">parse (Pho::Snapshot)</a><br />
+    <a href="classes/Pho/Job.html#M000085">progress_updates (Pho::Job)</a><br />
+    <a href="classes/Pho/Store.html#M000074">put_field_predicate_map (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000076">put_query_profile (Pho::Store)</a><br />
+    <a href="classes/Pho/Snapshot.html#M000077">read_from_store (Pho::Snapshot)</a><br />
+    <a href="classes/Pho/QueryProfile.html#M000024">read_from_store (Pho::QueryProfile)</a><br />
     <a href="classes/Pho/FieldPredicateMap.html#M000005">read_from_store (Pho::FieldPredicateMap)</a><br />
     <a href="classes/Pho/Status.html#M000021">read_from_store (Pho::Status)</a><br />
-    <a href="classes/Pho/QueryProfile.html#M000024">read_from_store (Pho::QueryProfile)</a><br />
-    <a href="classes/Pho/Snapshot.html#M000072">read_md5 (Pho::Snapshot)</a><br />
+    <a href="classes/Pho/Facet/Results.html#M000002">read_from_store (Pho::Facet::Results)</a><br />
+    <a href="classes/Pho/Job.html#M000083">read_from_store (Pho::Job)</a><br />
+    <a href="classes/Pho/Jobs.html#M000034">read_from_store (Pho::Jobs)</a><br />
+    <a href="classes/Pho/Snapshot.html#M000080">read_md5 (Pho::Snapshot)</a><br />
     <a href="classes/Pho/Status.html#M000022">readable? (Pho::Status)</a><br />
-    <a href="classes/Pho/Store.html#M000054">record_etags (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000060">reindex (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000064">record_etags (Pho::Store)</a><br />
     <a href="classes/Pho/QueryProfile.html#M000030">remove (Pho::QueryProfile)</a><br />
     <a href="classes/Pho/FieldPredicateMap.html#M000015">remove (Pho::FieldPredicateMap)</a><br />
     <a href="classes/Pho/FieldPredicateMap.html#M000016">remove_by_name (Pho::FieldPredicateMap)</a><br />
     <a href="classes/Pho/QueryProfile.html#M000029">remove_by_name (Pho::QueryProfile)</a><br />
     <a href="classes/Pho/FieldPredicateMap.html#M000017">remove_by_uri (Pho::FieldPredicateMap)</a><br />
-    <a href="classes/Pho/RDFCollection.html#M000080">reset (Pho::RDFCollection)</a><br />
-    <a href="classes/Pho/Store.html#M000059">reset (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000062">restore (Pho::Store)</a><br />
-    <a href="classes/Pho/RDFCollection.html#M000079">retry_failures (Pho::RDFCollection)</a><br />
-    <a href="classes/Pho/Etags.html#M000089">save (Pho::Etags)</a><br />
-    <a href="classes/Pho/Store.html#M000048">search (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000037">set_credentials (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000061">snapshot (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000047">sparql (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000045">sparql_ask (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000044">sparql_construct (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000043">sparql_describe (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000046">sparql_select (Pho::Store)</a><br />
-    <a href="classes/Pho/RDFCollection.html#M000078">store (Pho::RDFCollection)</a><br />
-    <a href="classes/Pho/Store.html#M000039">store_data (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000040">store_file (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000041">store_url (Pho::Store)</a><br />
-    <a href="classes/Pho/Store.html#M000063">submit_job (Pho::Store)</a><br />
-    <a href="classes/Pho/RDFCollection.html#M000083">successes (Pho::RDFCollection)</a><br />
-    <a href="classes/Pho/RDFCollection.html#M000085">summary (Pho::RDFCollection)</a><br />
-    <a href="classes/Pho/FieldPredicateMap.html#M000018">to_rdf (Pho::FieldPredicateMap)</a><br />
-    <a href="classes/Pho/DatatypeProperty.html#M000035">to_rdf (Pho::DatatypeProperty)</a><br />
-    <a href="classes/Pho/FieldWeighting.html#M000076">to_rdf (Pho::FieldWeighting)</a><br />
+    <a href="classes/Pho/RDFCollection.html#M000097">reset (Pho::RDFCollection)</a><br />
+    <a href="classes/Pho/RDFCollection.html#M000096">retry_failures (Pho::RDFCollection)</a><br />
+    <a href="classes/Pho/Job.html#M000089">running? (Pho::Job)</a><br />
+    <a href="classes/Pho/Etags.html#M000106">save (Pho::Etags)</a><br />
+    <a href="classes/Pho/Store.html#M000058">search (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000047">set_credentials (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000057">sparql (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000055">sparql_ask (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000054">sparql_construct (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000053">sparql_describe (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000056">sparql_select (Pho::Store)</a><br />
+    <a href="classes/Pho/Job.html#M000086">started? (Pho::Job)</a><br />
+    <a href="classes/Pho/RDFCollection.html#M000095">store (Pho::RDFCollection)</a><br />
+    <a href="classes/Pho/Store.html#M000049">store_data (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000050">store_file (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000051">store_url (Pho::Store)</a><br />
+    <a href="classes/Pho/Jobs.html#M000039">submit_job (Pho::Jobs)</a><br />
+    <a href="classes/Pho/Store.html#M000070">submit_job (Pho::Store)</a><br />
+    <a href="classes/Pho/Jobs.html#M000036">submit_reindex (Pho::Jobs)</a><br />
+    <a href="classes/Pho/Jobs.html#M000035">submit_reset (Pho::Jobs)</a><br />
+    <a href="classes/Pho/Jobs.html#M000038">submit_restore (Pho::Jobs)</a><br />
+    <a href="classes/Pho/Jobs.html#M000037">submit_snapshot (Pho::Jobs)</a><br />
+    <a href="classes/Pho/RDFCollection.html#M000100">successes (Pho::RDFCollection)</a><br />
+    <a href="classes/Pho/Job.html#M000088">successful? (Pho::Job)</a><br />
+    <a href="classes/Pho/RDFCollection.html#M000102">summary (Pho::RDFCollection)</a><br />
     <a href="classes/Pho/QueryProfile.html#M000032">to_rdf (Pho::QueryProfile)</a><br />
+    <a href="classes/Pho/FieldPredicateMap.html#M000018">to_rdf (Pho::FieldPredicateMap)</a><br />
+    <a href="classes/Pho/DatatypeProperty.html#M000045">to_rdf (Pho::DatatypeProperty)</a><br />
+    <a href="classes/Pho/FieldWeighting.html#M000093">to_rdf (Pho::FieldWeighting)</a><br />
     <a href="classes/Pho/FieldPredicateMap.html#M000019">upload (Pho::FieldPredicateMap)</a><br />
     <a href="classes/Pho/QueryProfile.html#M000033">upload (Pho::QueryProfile)</a><br />
-    <a href="classes/Pho/Store.html#M000055">upload_item (Pho::Store)</a><br />
+    <a href="classes/Pho/Store.html#M000065">upload_item (Pho::Store)</a><br />
+    <a href="classes/Pho/Jobs.html#M000042">wait_for (Pho::Jobs)</a><br />
+    <a href="classes/Pho/Jobs.html#M000041">wait_for_submitted (Pho::Jobs)</a><br />
+    <a href="classes/Pho/Job.html#M000091">with_each (Pho::Job)</a><br />
+    <a href="classes/Pho/Job.html#M000090">with_first (Pho::Job)</a><br />
     <a href="classes/Pho/Status.html#M000023">writeable? (Pho::Status)</a><br />
+    <a href="classes/Pho/Jobs.html#M000043">yield_job_update (Pho::Jobs)</a><br />
   </div>
 </div>
 </body>

data/lib/pho.rb

@@ -11,6 +11,7 @@ require 'pho/field_predicate_map'
 require 'pho/query_profile'
 require 'pho/status'
 require 'pho/facet'
+require 'pho/job'
 require 'pho/rdf_collection'
 
 module Pho
@@ -19,19 +20,26 @@ module Pho
   ACCEPT_JSON = { "Accept" => "application/json" }.freeze
   
   RDF_XML = {"Content-Type"=>"application/rdf+xml"}.freeze
-
-  JOB_RESET = "http://schemas.talis.com/2006/bigfoot/configuration#ResetDataJob".freeze
-  JOB_SNAPSHOT = "http://schemas.talis.com/2006/bigfoot/configuration#SnapshotJob".freeze
-  JOB_REINDEX = "http://schemas.talis.com/2006/bigfoot/configuration#ReindexJob".freeze   
-  JOB_RESTORE = "http://schemas.talis.com/2006/bigfoot/configuration#RestoreJob".freeze
-     
-
-  module Namespaces
+    
+  class Namespaces
 
     CONFIG = "http://schemas.talis.com/2006/bigfoot/configuration#"
     FRAME = "http://schemas.talis.com/2006/frame/schema#"
     FACET = "http://schemas.talis.com/2007/facet-results#"
-        
+    RDF = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    RDFS = "http://www.w3.org/2000/01/rdf-schema#"
+    DC = "http://purl.org/dc/elements/1.1/"
+    DC_TERMS = "http://purl.org/dc/terms/"
+    
+    MAPPING = {
+      "bf" => CONFIG,
+      "frm" => FRAME,
+      "rdf" => RDF,
+      "rdfs" => RDFS,
+      "dc" => DC,
+      "dcterms" => DC_TERMS  
+    }
+    
   end
-  
+
 end

data/lib/pho/field_predicate_map.rb

@@ -42,7 +42,12 @@ module Pho
     #English analyzer without stop words and with accent support. This is identical to the standard English analyzer but all words are indexed plus any accented characters in the ISO Latin 1 character set are replaced by their unaccented equivalent
     #See API documentation at http://n2.talis.com/wiki/Field_Predicate_Map for details of replacements
     NORMALISE_STANDARD = "http://schemas.talis.com/2007/bigfoot/analyzers#norm-en".freeze
-          
+
+    #English analyzer with porter stemming, case normalization, latin 1 normalization, and stop words removal
+    PORTER_NORMALIZE_STANDARD = "http://schemas.talis.com/2007/bigfoot/analyzers#porter-norm-en".freeze
+    
+    #English analyzer with porter stemming, case normalization and latin 1 normalization. 
+    PORTER_NO_STOP_WORD_STANDARD = "http://schemas.talis.com/2007/bigfoot/analyzers#porter-nostop-norm-en".freeze                    
   end  
   
   #Captures information about a mapped datatype from a Field Predicate Map

data/lib/pho/job.rb

@@ -1,17 +1,337 @@
 module Pho
+
+#TODO job deletion
+        
+  class Jobs
+
+    RESET = "http://schemas.talis.com/2006/bigfoot/configuration#ResetDataJob".freeze
+    SNAPSHOT = "http://schemas.talis.com/2006/bigfoot/configuration#SnapshotJob".freeze
+    REINDEX = "http://schemas.talis.com/2006/bigfoot/configuration#ReindexJob".freeze   
+    RESTORE = "http://schemas.talis.com/2006/bigfoot/configuration#RestoreJob".freeze
+
+    #Reads the current list of scheduled jobs from the provided store. Returns an array of 
+    #job names
+    #
+    # store:: store from which to read the scheduled job list
+    def Jobs.read_from_store(store)
+      resp = store.get_jobs()
+      if resp.status != 200
+        raise "Unable to read jobs from store. Status was {resp.status}"
+      end
+      jobs = Array.new
+      
+      doc = REXML::Document.new(resp.content)
+      REXML::XPath.each(doc.root, "//bf:job", Pho::Namespaces::MAPPING).each do |el|
+        jobs << el.attributes["rdf:resource"]
+      end
+      return jobs
+      
+    end
+
+    #Submit a reset job to the Platform
+    #
+    #This method submits the job, and will return an HTTP:Message indicating the 
+    #response from the Platform. Client code should check this for success. As job
+    #processing may not be immediate, clients should determine the URI of the newly created 
+    #job and then monitor the jobs status if they need to wait for the job to finish.
+    def Jobs.submit_reset(store, label="Reset my store", t=Time.now)
+      return submit_job(store, Pho::Jobs::RESET, label, t)
+    end
+
+    #Submit a reindex job to the Platform
+    #
+    #This method submits the job, and will return an HTTP:Message indicating the 
+    #response from the Platform. Client code should check this for success. As job
+    #processing may not be immediate, clients should determine the URI of the newly created 
+    #job and then monitor the jobs status if they need to wait for the job to finish.            
+    def Jobs.submit_reindex(store, label="Reindex my store", t=Time.now)
+      return submit_job(store, Pho::Jobs::REINDEX, label, t)      
+    end
+    
+    #Submit a snapshot job to the Platform    
+    #
+    #This method submits the job, and will return an HTTP:Message indicating the 
+    #response from the Platform. Client code should check this for success. As job
+    #processing may not be immediate, clients should determine the URI of the newly created 
+    #job and then monitor the jobs status if they need to wait for the job to finish.    
+    def Jobs.submit_snapshot(store, label="Snapshot my store", t=Time.now)
+      return submit_job(store, Pho::Jobs::SNAPSHOT, label, t)
+    end  
+
+    #Submit a restore job to the Platform    
+    #
+    #This method submits the job, and will return an HTTP:Message indicating the 
+    #response from the Platform. Client code should check this for success. As job
+    #processing may not be immediate, clients should determine the URI of the newly created 
+    #job and then monitor the jobs status if they need to wait for the job to finish.    
+    def Jobs.submit_restore(store, snapshot_uri, label="Restore my snapshot", t=Time.now)
+      return submit_job(store, Pho::Jobs::RESTORE, label, t, snapshot_uri)
+    end        
+    
+    #Generic submit job method    
+    def Jobs.submit_job(store, jobtype, label, t=Time.now, snapshot_uri=nil)
+      store.submit_job( build_job_request(jobtype, label, t, snapshot_uri) )
+    end
+
+    # Construct an RDF/XML document containing a job request for submitting to the Platform.
+    #
+    # t:: a Time object, specifying the time at which the request should be carried out
+    def Jobs.build_job_request(type, label, t=Time.now, snapshot_uri=nil)
+      
+      time = t.getutc.strftime("%Y-%m-%dT%H:%M:%SZ")
+      data = "<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" "
+      data << " xmlns:rdfs=\"http://www.w3.org/2000/01/rdf-schema#\" " 
+      data << " xmlns:bf=\"http://schemas.talis.com/2006/bigfoot/configuration#\"> " 
+      data << " <bf:JobRequest>"
+      data << "   <rdfs:label>#{label}</rdfs:label>"    
+      data << "   <bf:jobType rdf:resource=\"#{type}\"/>"
+      data << "   <bf:startTime>#{time}</bf:startTime>"
+      
+      if (snapshot_uri != nil)
+        data << "   <bf:snapshotUri rdf:resource=\"#{snapshot_uri}\"/>"        
+      end
+      
+      data << " </bf:JobRequest>"
+      data << "</rdf:RDF>"
+      return data      
+    end    
+
+    #Wait for a newly submitted job to finish
+    def Jobs.wait_for_submitted(resp, store, interval=1, &block)
+      if resp.status != 201
+        raise "Unable to wait, job was not created. Status was #{resp.status}"
+      end
+      job_url = resp.header["Location"].first
+      return wait_for(job_url, store, interval, &block)
+    end
+    
+    #Wait for the specified job to finish
+    #
+    #The method will repeatedly contact the Platform to determine whether the job has finished
+    #executing. The requests are made at configurable intervals (once a minute by default). If 
+    #a block is supplied, then it is passed a reference to the Job (containing current progress 
+    #updates) after each request. The Job object is returned once completed.
+    #
+    # uri:: URI of the job to wait for
+    # store:: the store on which the job is running
+    # interval:: the interval at which checks will be made, in minutes. Default is 1
+    def Jobs.wait_for(uri, store, interval=1, &block)
+        updates = 0
+        job = Job.read_from_store(uri, store)
+        updates = yield_job_update(job, updates, &block)
+        while !job.completed?
+          sleep interval*60
+          job = Job.read_from_store(uri, store)
+          updates = yield_job_update(job, updates, &block)
+        end
+        return job
+    end
+    
+    protected
+    
+      def Jobs.yield_job_update(job, updates)
+        if block_given?
+            if job.started?
+              
+              #only yield start message if we've not seen any updates
+              if updates == 0
+                yield job, job.start_message, job.actual_start_time  
+              end
+                            
+              if job.progress_updates.length > 0
+                unseen = job.progress_updates[updates, job.progress_updates.length] 
+                unseen.each do |update|
+                  yield job, update.message, update.time
+                end
+                updates = job.progress_updates.length                
+              end
+              
+              if job.completed?
+                  yield job, job.completion_message, job.end_time
+              end
+              
+            end
+        end        
+        return updates  
+      end
+      
+  end
   
-  # Captures information about a Platform Job   
-  class Job
+  #Simple object encapsulating the status message and time for a job update
+  class JobUpdate
   
+    #the status message
+    attr_accessor :message
+    #the time at which the update was logged
+    attr_accessor :time
     
-    # Parse out an array of Job objects from a response returned from the Platform
-    def Job.parse_jobs(resp)
+  end  
+  
+  # A Platform Job
+  #
+  # Instances of this class encapsulate all of the core metadata relating to a Platform Job.
+  # This includes not only the timing information but also the completion status, etc.
+  # 
+  # The class provides convenience methods for retrieving and parsing data about a specific
+  # Job from a platform store
+  class Job
+
+    SUCCESS = "http://schemas.talis.com/2006/bigfoot/configuration#success"
+    ABORTED = "http://schemas.talis.com/2006/bigfoot/configuration#aborted"            
+          
+    #URI of the job
+    attr_reader :uri
+    #Label associated with job
+    attr_reader :label
+    #Type of job
+    attr_reader :type
+    #Date-time that the job was created
+    attr_reader :created
+    #Date-time that the job will start
+    attr_reader :start_time
+    #Date-time that the job actually started
+    attr_accessor :actual_start_time    
+    #URI of snapshot to load. (For RestoreJob only)
+    attr_accessor :snapshot_uri
+    #Message recorded at the time the job started
+    attr_accessor :start_message
+    #An array of JobUpdate instances. May be empty if no updates have been logged
+    attr_accessor :progress_updates
+    #URI indicating completion status of the job
+    attr_accessor :completion_status
+    #Completion message
+    attr_accessor :completion_message
+    #Date time that the job actually completed
+    attr_accessor :end_time
+    
+    #Constructor. Used in the reading/parsing code
+    #
+    #uri:: a unique identifier for the job
+    #label:: a description of the job
+    #type:: the type of the job, e.g. Pho::Jobs::RESTORE
+    #created:: date-time the job was created in the system
+    #start_time:: scheduled start time for the job   
+    def initialize(uri, label, type, start_time, created=nil)
+      @uri = uri
+      @label = label
+      @type = type
+      @created = created
+      @start_time = start_time
+      @progress_updates = Array.new
+    end
+    
+    #Read a job from a store
+    #
+    #uri:: uri of the job to read
+    #store:: store from which the job will be read 
+    def Job.read_from_store(uri, store)
+      resp = store.get_job(uri)
       if resp.status != 200
-        throw
+        raise "Unable to read job from store. Response code was #{resp.status}"
+      end
+      
+      return parse(uri, resp.content)      
+    end    
+    
+    #Parses job metadata returned from the platform as RDF/XML, creating a fully populated
+    #Job instance
+    #
+    #uri:: uri of the job to be parsed
+    #xml:: the RDF/XML text to be parsed
+    def Job.parse(uri, xml)
+      doc = REXML::Document.new(xml)
+      root = doc.root
+       
+      #job_el = REXML::XPath.first(root, "rdf:Description[rdf:type]", Pho::Namespaces::MAPPING )      
+      job_el = REXML::XPath.first(root, "//*[@rdf:about='#{uri}']", Pho::Namespaces::MAPPING )
+      uri = job_el.attributes["rdf:about"]
+      label = REXML::XPath.first(job_el, "rdfs:label", Pho::Namespaces::MAPPING ).text
+      type_el = REXML::XPath.first(job_el, "rdf:type", Pho::Namespaces::MAPPING )
+      type = type_el.attributes["rdf:resource"]
+      created = REXML::XPath.first(job_el, "dcterms:created", Pho::Namespaces::MAPPING ).text
+      start_time = REXML::XPath.first(job_el, "bf:startTime", Pho::Namespaces::MAPPING ).text
+   
+      job = Job.new(uri, label, type, start_time, created)
+      if type == Pho::Jobs::RESTORE
+        with_first(job_el, "bf:snapshotUri") do |uri|
+          job.snapshot_uri = uri.attributes["rdf:resource"]
+        end
+      end
+            
+      with_first(job_el, "bf:actualStartTime") do |el|
+        job.actual_start_time = el.text
+      end
+      with_first(job_el, "bf:startMessage") do |el|
+        job.start_message = el.text
+      end
+      with_first(job_el, "bf:completionMessage") do |el|
+        job.completion_message = el.text
+      end
+      with_first(job_el, "bf:endTime") do |el|
+          job.end_time = el.text
+      end      
+      with_first(job_el, "bf:completionStatus") do |el|
+        job.completion_status = el.attributes["rdf:resource"]
+      end
+      with_each(job_el, "bf:progressUpdate") do |el|
+        update = JobUpdate.new
+        with_first(el, "bf:progressUpdateMessage") do |msg|
+          update.message = msg.text
+        end
+        with_first(el, "bf:progressUpdateTime") do |time|
+          update.time = time.text
+        end
+        job.progress_updates << update
       end
-      return nil
+         
+      return job 
+      
+    end
+    
+    def progress_updates()
+      @progress_updates.sort! { |x,y|
+        x.time <=> y.time 
+      }
+      return @progress_updates       
+    end
+    
+    #Has the job started?
+    def started?
+      return @actual_start_time != nil
+    end
+    
+    #Has the job completed?
+    def completed?
+      return @completion_status != nil
+    end
+    
+    #Was the job successful?
+    def successful?
+      return self.completed? && @completion_status == Pho::Job::SUCCESS
     end
+    
+    #Is the job still running?
+    def running?
+      return started? && !completed?
+    end  
+    
+    protected
+        
+      def Job.with_first(el, xpath)
+        found_el = REXML::XPath.first(el, xpath, Pho::Namespaces::MAPPING)
+        if found_el != nil
+          yield found_el
+        end
+      end
       
+      def Job.with_each(el, xpath)
+        REXML::XPath.each(el, xpath, Pho::Namespaces::MAPPING) do |e|
+          root = e.document.root
+          uri = e.attributes["rdf:resource"]
+          ref_el = REXML::XPath.first(root, "//*[@rdf:about='#{uri}']", Pho::Namespaces::MAPPING)
+          yield ref_el
+        end
+      end      
   end
     
 end