pho 0.6.2 → 0.7

data/CHANGES

@@ -1,5 +1,17 @@
 Brief notes on significant changes and additions in each release
 
+== Version 0.7
+
+* Started on OAI client
+* New commandline options: add_mapping and add_weight
+* Updated talis_store so that it now supports environment variables for user, pass, store (TALIS_USER, TALIS_PASS, TALIS_STORE)
+* Added getfpmap and getqueryprofile methods to command-line application for retrieving either a summary or the raw data
+* Updated command-line job control functions so that the Job URI is echoed to command-line.
+* Updated RDFManager so that it will now automatically upload all .rdf, .ttl and .nt files in directory. An array of extension can be provided to 
+  configure this behaviour
+* Updated command-line tool so that it will now handle uploads of turtle (.ttl) and ntriples (.nt) files correctly
+* Updated Store class to allow mimetype of files and data to be specified when uploading to metabox. Useful now that the platform supports turtle
+
 == Version 0.6.1
 
 * Added examples/linkeddata/proxy.rb

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/testtask'
 require 'rake/clean'
 
 NAME = "pho"
-VER = "0.6.2"
+VER = "0.7"
 
 RDOC_OPTS = ['--quiet', '--title', 'Pho (Talis Platform Client) Reference', '--main', 'README']
 

data/bin/talis_store

@@ -18,6 +18,20 @@ DESCRIPTION
     
 MODE
 
+  add_mapping
+    Add an entry to the field predicate map
+
+    example :
+   
+      #{ PROGRAM } add_mapping -u user -p pass -s my-dev1 --field name --predicate http://xmlns.com/foaf/0.1/name
+       
+  add_weight
+    Add a field weight to the query profile
+
+    example :
+
+      #{ PROGRAM } add_mapping -u user -p pass -s my-dev1 --field name --weight 2.0
+        
   backup
     Take a snapshot of a store and then download that new snapshot to the local system
     By default the snapshot is downloaded into /tmp, but can be specified on the command-line
@@ -34,6 +48,22 @@ MODE
   
       #{ PROGRAM } describe -u user -p pass -s my-dev1 -r http://www.example.org/foo
 
+  getfpmap
+    Fetch and display FieldPredicate map from store   
+
+    example :
+
+      #{ PROGRAM } getfpmap -u user -p pass -s my-dev1
+      #{ PROGRAM } getfpmap -u user -p pass -s my-dev1 --raw
+
+  getqueryprofile
+    Fetch and display QueryProfile from store   
+
+    example :
+
+      #{ PROGRAM } getqueryprofile -u user -p pass -s my-dev1
+      #{ PROGRAM } getqueryprofile -u user -p pass -s my-dev1 --raw
+        
   reindex
     Trigger a reindex job on the store
       
@@ -41,6 +71,13 @@ MODE
     
       #{ PROGRAM } reindex -u user -p pass -s my-dev1
   
+  remove_mapping
+    Remove a mapping from both the field predicate map and the query profile
+    
+    example :
+
+      #{ PROGRAM } remove_mapping -u user -p pass -s my-dev1 --field name
+    
   reset
     Reset the store. THIS WILL DELETE ALL DATA.
       
@@ -77,7 +114,7 @@ MODE
   store
     Upload some RDF data to the metabox in a Platform store. Can either specify a local file, or a URL
     When a url is specified, then the data is retrieved and then submitted to the Platform
-    Can also be used to store an entire directory of RDF/XML using the --dir option.
+    Can also be used to store an entire directory of RDF/XML, Turtle and ntriples using the --dir option.
        
     example :
   
@@ -116,7 +153,17 @@ OPTIONS
   --traverse
     recursively store files or RDF
   --base
-    base path for uploading files to content box      
+    base path for uploading files to content box
+  --raw
+    output raw API response, e.g. for fpmap and queryprofile
+  --field
+    name of a field for fpmap or query profile
+  --predicate
+    predicate uri
+  --weight
+    weighting for a field in query profile
+  --analyzer
+    name or uri of analyzer                
 EOL
 
 mode = ARGV.shift
@@ -130,7 +177,12 @@ opts = GetoptLong::new(
          [ "--file"            , "-f" , GetoptLong::REQUIRED_ARGUMENT ],
          [ "--dir"             , "-d" , GetoptLong::REQUIRED_ARGUMENT ],
          [ "--traverse"        , "-t" , GetoptLong::NO_ARGUMENT ],
-         [ "--base"            , "-b" , GetoptLong::REQUIRED_ARGUMENT ]                                                                               
+         [ "--base"            , "-b" , GetoptLong::REQUIRED_ARGUMENT ],
+         [ "--raw"             , GetoptLong::NO_ARGUMENT ],
+         [ "--field"           , GetoptLong::REQUIRED_ARGUMENT ],                             
+         [ "--predicate"       , GetoptLong::REQUIRED_ARGUMENT ],
+         [ "--weight"          , GetoptLong::REQUIRED_ARGUMENT ],
+         [ "--analyzer"        , GetoptLong::REQUIRED_ARGUMENT ]
        ).enum_for.inject({}) { |h, (k, v)| h.update k.delete('-') => v }
 
 mode = "help" if opts["--help"]
@@ -139,30 +191,50 @@ if mode == "help"
   USAGE.display  
 else
 
-  if !opts["username"]
-    puts "no <username>"
-    abort USAGE
-  end
-  if !opts["password"]
-    puts "no <password>"
-    abort USAGE
-  end  
-  if !opts["store"]
-    puts "no <store>"
-    abort USAGE
-  end  
-  
-  storename = opts["store"]
-  if !storename.start_with?("http")
-      storename = "http://api.talis.com/stores/#{storename}"  
-  end
   
-  store = Pho::Store.new(storename, opts["username"], opts["password"])
-  cmds = Pho::CommandLine.new(store, opts)
+#  if !opts["username"]
+#    puts "no <username>"
+#    abort USAGE
+#  end
+#  if !opts["password"]
+#    puts "no <password>"
+#    abort USAGE
+#  end  
+#  if !opts["store"]
+#    puts "no <store>"
+#    abort USAGE
+#  end  
+#  
+#  storename = opts["store"]
+#  if !storename.start_with?("http")
+#      storename = "http://api.talis.com/stores/#{storename}"  
+#  end
+#  
+#  store = Pho::Store.new(storename, opts["username"], opts["password"])
   
+  cmds = nil
+  begin
+    cmds = Pho::CommandLine.new(opts, ENV)
+  rescue RuntimeError => e
+    puts e
+    abort USAGE
+  end
+    
   #begin
     
-    case mode
+  #TODO
+  #remove_mapping
+    case mode      
+      when "add_mapping"
+        if opts["predicate"] == nil || opts["field"] == nil
+          abort USAGE
+        end
+        cmds.add_mapping()
+      when "add_weight"  
+        if opts["weight"] == nil || opts["field"] == nil
+          abort USAGE
+        end 
+        cmds.add_weight()
       when "status"
          cmds.status()
       when "backup"
@@ -194,7 +266,9 @@ else
         if opts["file"] == nil
           abort USAGE
         end 
-        cmds.sparql()                            
+        cmds.sparql()  
+      when "getfpmap"
+        cmds.fpmap()                           
       else
          abort USAGE
     end  

data/doc/rdoc/classes/Pho.html

@@ -114,6 +114,10 @@
                 <a href="../files/lib/pho/changeset_rb.html">
                 lib/pho/changeset.rb
                 </a>
+        <br />
+                <a href="../files/lib/pho/oai_rb.html">
+                lib/pho/oai.rb
+                </a>
         <br />
                 <a href="../files/lib/pho/file_management_rb.html">
                 lib/pho/file_management.rb
@@ -172,6 +176,7 @@ TODO put together proper test suite for this
       Module <a href="Pho/Enrichment.html" class="link">Pho::Enrichment</a><br />
 Module <a href="Pho/Facet.html" class="link">Pho::Facet</a><br />
 Module <a href="Pho/FileManagement.html" class="link">Pho::FileManagement</a><br />
+Module <a href="Pho/OAI.html" class="link">Pho::OAI</a><br />
 Module <a href="Pho/RDF.html" class="link">Pho::RDF</a><br />
 Module <a href="Pho/ResourceHash.html" class="link">Pho::ResourceHash</a><br />
 Module <a href="Pho/Sparql.html" class="link">Pho::Sparql</a><br />
@@ -215,6 +220,16 @@ Class <a href="Pho/StoreSparqlClient.html" class="link">Pho::StoreSparqlClient</
           <td>=</td>
           <td class="context-item-value">{&quot;Content-Type&quot;=&gt;&quot;application/rdf+xml&quot;}.freeze</td>
         </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">TURTLE</td>
+          <td>=</td>
+          <td class="context-item-value">{&quot;Content-Type&quot;=&gt;&quot;text/turtle&quot;}.freeze</td>
+        </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">NTRIPLES</td>
+          <td>=</td>
+          <td class="context-item-value">{&quot;Content-Type&quot;=&gt;&quot;text/plain&quot;}.freeze</td>
+        </tr>
         <tr class="top-aligned-row context-row">
           <td class="context-item-name">READ_ONLY</td>
           <td>=</td>

data/doc/rdoc/classes/Pho/CommandLine.html

@@ -92,17 +92,24 @@ Class that implements the command-line behaviour
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000110">backup</a>&nbsp;&nbsp;
-      <a href="#M000115">describe</a>&nbsp;&nbsp;
-      <a href="#M000108">new</a>&nbsp;&nbsp;
-      <a href="#M000112">reindex</a>&nbsp;&nbsp;
-      <a href="#M000113">reset</a>&nbsp;&nbsp;
-      <a href="#M000114">restore</a>&nbsp;&nbsp;
-      <a href="#M000111">snapshot</a>&nbsp;&nbsp;
-      <a href="#M000116">sparql</a>&nbsp;&nbsp;
-      <a href="#M000109">status</a>&nbsp;&nbsp;
-      <a href="#M000117">store</a>&nbsp;&nbsp;
-      <a href="#M000118">upload</a>&nbsp;&nbsp;
+      <a href="#M000128">add_mapping</a>&nbsp;&nbsp;
+      <a href="#M000129">add_weight</a>&nbsp;&nbsp;
+      <a href="#M000117">backup</a>&nbsp;&nbsp;
+      <a href="#M000122">describe</a>&nbsp;&nbsp;
+      <a href="#M000126">fpmap</a>&nbsp;&nbsp;
+      <a href="#M000112">new</a>&nbsp;&nbsp;
+      <a href="#M000114">password</a>&nbsp;&nbsp;
+      <a href="#M000127">queryprofile</a>&nbsp;&nbsp;
+      <a href="#M000119">reindex</a>&nbsp;&nbsp;
+      <a href="#M000120">reset</a>&nbsp;&nbsp;
+      <a href="#M000121">restore</a>&nbsp;&nbsp;
+      <a href="#M000118">snapshot</a>&nbsp;&nbsp;
+      <a href="#M000123">sparql</a>&nbsp;&nbsp;
+      <a href="#M000116">status</a>&nbsp;&nbsp;
+      <a href="#M000124">store</a>&nbsp;&nbsp;
+      <a href="#M000115">storename</a>&nbsp;&nbsp;
+      <a href="#M000125">upload</a>&nbsp;&nbsp;
+      <a href="#M000113">username</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -124,24 +131,38 @@ Class that implements the command-line behaviour
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000108" class="method-detail">
-        <a name="M000108"></a>
+      <div id="method-M000112" class="method-detail">
+        <a name="M000112"></a>
 
         <div class="method-heading">
-          <a href="#M000108" class="method-signature">
-          <span class="method-name">new</span><span class="method-args">(store, opts)</span>
+          <a href="#M000112" class="method-signature">
+          <span class="method-name">new</span><span class="method-args">(opts, env, store=nil)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000108-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000108-source">
+            onclick="toggleCode('M000112-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000112-source">
 <pre>
 <span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 6</span>
-    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">store</span>, <span class="ruby-identifier">opts</span>)
-       <span class="ruby-ivar">@store</span> = <span class="ruby-identifier">store</span>      
-       <span class="ruby-ivar">@opts</span> = <span class="ruby-identifier">opts</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">opts</span>, <span class="ruby-identifier">env</span>, <span class="ruby-identifier">store</span>=<span class="ruby-keyword kw">nil</span>)
+     <span class="ruby-ivar">@opts</span> = <span class="ruby-identifier">opts</span>
+     <span class="ruby-ivar">@env</span> = <span class="ruby-identifier">env</span>          
+      
+     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">username</span>() <span class="ruby-operator">==</span> <span class="ruby-keyword kw">nil</span>
+       <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;no &lt;username&gt;&quot;</span>
+     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">password</span>() <span class="ruby-operator">==</span> <span class="ruby-keyword kw">nil</span>
+        <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;no &lt;password&gt;&quot;</span>
+     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">storename</span>() <span class="ruby-operator">==</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">store</span> <span class="ruby-operator">==</span> <span class="ruby-keyword kw">nil</span>
+        <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;no &lt;store&gt;&quot;</span>
+     <span class="ruby-keyword kw">end</span>
+
+     <span class="ruby-ivar">@store</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Store</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">storename</span>(), <span class="ruby-identifier">username</span>(), <span class="ruby-identifier">password</span>()) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">store</span> <span class="ruby-operator">==</span> <span class="ruby-keyword kw">nil</span>
+     <span class="ruby-ivar">@store</span> = <span class="ruby-identifier">store</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">store</span> <span class="ruby-operator">!=</span> <span class="ruby-keyword kw">nil</span>
+           
     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -150,25 +171,97 @@ Class that implements the command-line behaviour
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000110" class="method-detail">
-        <a name="M000110"></a>
+      <div id="method-M000128" class="method-detail">
+        <a name="M000128"></a>
+
+        <div class="method-heading">
+          <a href="#M000128" class="method-signature">
+          <span class="method-name">add_mapping</span><span class="method-args">(out=$stdout)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000128-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000128-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 252</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_mapping</span>(<span class="ruby-identifier">out</span>=<span class="ruby-identifier">$stdout</span>)
+      <span class="ruby-identifier">fpmap</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">FieldPredicateMap</span>.<span class="ruby-identifier">read_from_store</span>(<span class="ruby-ivar">@store</span>)
+      <span class="ruby-identifier">mapping</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">FieldPredicateMap</span>.<span class="ruby-identifier">create_mapping</span>(<span class="ruby-ivar">@store</span>, <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;predicate&quot;</span>], <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;field&quot;</span>], <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;analyzer&quot;</span>])
+
+      <span class="ruby-identifier">removed</span> = <span class="ruby-identifier">fpmap</span>.<span class="ruby-identifier">remove_by_name</span>(<span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;field&quot;</span>])
+      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">removed</span> <span class="ruby-operator">!=</span> <span class="ruby-keyword kw">nil</span>
+        <span class="ruby-identifier">out</span>.<span class="ruby-identifier">puts</span>(<span class="ruby-node">&quot;Replacing mapping for #{@opts[&quot;field&quot;]}&quot;</span>)  
+      <span class="ruby-keyword kw">end</span>      
+      <span class="ruby-identifier">fpmap</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">mapping</span>
+      <span class="ruby-identifier">resp</span> = <span class="ruby-identifier">fpmap</span>.<span class="ruby-identifier">upload</span>(<span class="ruby-ivar">@store</span>)
+      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">resp</span>.<span class="ruby-identifier">status</span> <span class="ruby-operator">!=</span> <span class="ruby-value">200</span>
+        <span class="ruby-identifier">out</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Unable to update FieldPredicate map in store. Response code was #{resp.status}&quot;</span>
+      <span class="ruby-keyword kw">else</span>
+        <span class="ruby-identifier">out</span>.<span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;FieldPredicate map successfully updated&quot;</span>
+      <span class="ruby-keyword kw">end</span>
+    <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000129" class="method-detail">
+        <a name="M000129"></a>
 
         <div class="method-heading">
-          <a href="#M000110" class="method-signature">
+          <a href="#M000129" class="method-signature">
+          <span class="method-name">add_weight</span><span class="method-args">(out=$stdout)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000129-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000129-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 269</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_weight</span>(<span class="ruby-identifier">out</span>=<span class="ruby-identifier">$stdout</span>)
+      <span class="ruby-identifier">qp</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">QueryProfile</span>.<span class="ruby-identifier">read_from_store</span>(<span class="ruby-ivar">@store</span>)
+      <span class="ruby-identifier">weight</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">QueryProfile</span>.<span class="ruby-identifier">create_weighting</span>(<span class="ruby-ivar">@store</span>, <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;field&quot;</span>], <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;weight&quot;</span>])
+      
+      <span class="ruby-identifier">removed</span> = <span class="ruby-identifier">qp</span>.<span class="ruby-identifier">remove_by_name</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;field&quot;</span>] )
+      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">removed</span> <span class="ruby-operator">!=</span> <span class="ruby-keyword kw">nil</span>
+          <span class="ruby-identifier">out</span>.<span class="ruby-identifier">puts</span>(<span class="ruby-node">&quot;Replacing weighting for #{@opts[&quot;field&quot;]}&quot;</span>)        
+      <span class="ruby-keyword kw">end</span>
+      <span class="ruby-identifier">qp</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">weight</span>
+      <span class="ruby-identifier">resp</span> = <span class="ruby-identifier">qp</span>.<span class="ruby-identifier">upload</span>(<span class="ruby-ivar">@store</span>)
+      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">resp</span>.<span class="ruby-identifier">status</span> <span class="ruby-operator">!=</span> <span class="ruby-value">200</span>
+        <span class="ruby-identifier">out</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Unable to update QueryProfile in store. Response code was #{resp.status}&quot;</span>
+      <span class="ruby-keyword kw">else</span>
+        <span class="ruby-identifier">out</span>.<span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;QueryProfile successfully updated&quot;</span>
+      <span class="ruby-keyword kw">end</span>      
+    <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000117" class="method-detail">
+        <a name="M000117"></a>
+
+        <div class="method-heading">
+          <a href="#M000117" class="method-signature">
           <span class="method-name">backup</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000110-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000110-source">
+            onclick="toggleCode('M000117-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000117-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 16</span>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 52</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">backup</span>()
-      <span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;Submitting Snapshot Job&quot;</span>
+      <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Submitting Snapshot Job to Store #{@store.storeuri}&quot;</span>
       <span class="ruby-identifier">resp</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Jobs</span>.<span class="ruby-identifier">submit_snapshot</span>(<span class="ruby-ivar">@store</span>, <span class="ruby-value str">&quot;Reindex&quot;</span>, <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>)
-      <span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;Monitoring Job&quot;</span>
+      <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Monitoring Snapshot Job: #{resp.header[&quot;Location&quot;].first}&quot;</span>
       <span class="ruby-identifier">job</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Jobs</span>.<span class="ruby-identifier">wait_for_submitted</span>(<span class="ruby-identifier">resp</span>, <span class="ruby-ivar">@store</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">job</span>, <span class="ruby-identifier">message</span>, <span class="ruby-identifier">time</span><span class="ruby-operator">|</span>
          <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;#{time} #{message}&quot;</span>
       <span class="ruby-keyword kw">end</span> 
@@ -184,21 +277,21 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000115" class="method-detail">
-        <a name="M000115"></a>
+      <div id="method-M000122" class="method-detail">
+        <a name="M000122"></a>
 
         <div class="method-heading">
-          <a href="#M000115" class="method-signature">
+          <a href="#M000122" class="method-signature">
           <span class="method-name">describe</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000115-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000115-source">
+            onclick="toggleCode('M000122-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000122-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 78</span>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 115</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">describe</span>()
       <span class="ruby-identifier">resp</span> = <span class="ruby-ivar">@store</span>.<span class="ruby-identifier">describe</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;url&quot;</span>] )
       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">resp</span>.<span class="ruby-identifier">status</span> <span class="ruby-operator">==</span> <span class="ruby-value">200</span>
@@ -213,23 +306,135 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000112" class="method-detail">
-        <a name="M000112"></a>
+      <div id="method-M000126" class="method-detail">
+        <a name="M000126"></a>
 
         <div class="method-heading">
-          <a href="#M000112" class="method-signature">
+          <a href="#M000126" class="method-signature">
+          <span class="method-name">fpmap</span><span class="method-args">(out=$stdout)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000126-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000126-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 203</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">fpmap</span>(<span class="ruby-identifier">out</span>=<span class="ruby-identifier">$stdout</span>)
+      
+      <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;raw&quot;</span>]
+        <span class="ruby-identifier">resp</span> = <span class="ruby-ivar">@store</span>.<span class="ruby-identifier">get_field_predicate_map</span>(<span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">ACCEPT_RDF</span>)        
+        <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">resp</span>.<span class="ruby-identifier">status</span> <span class="ruby-operator">!=</span> <span class="ruby-value">200</span>
+          <span class="ruby-identifier">out</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Unable to read Field Predicate Map from store. Response code was #{resp.status}&quot;</span>
+        <span class="ruby-keyword kw">else</span>
+          <span class="ruby-identifier">out</span>.<span class="ruby-identifier">puts</span> <span class="ruby-identifier">resp</span>.<span class="ruby-identifier">content</span>
+        <span class="ruby-keyword kw">end</span>
+      <span class="ruby-keyword kw">else</span>  
+        <span class="ruby-identifier">fpmap</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">FieldPredicateMap</span>.<span class="ruby-identifier">read_from_store</span>(<span class="ruby-ivar">@store</span>)
+        <span class="ruby-identifier">mappings</span> = <span class="ruby-identifier">fpmap</span>.<span class="ruby-identifier">datatype_properties</span>.<span class="ruby-identifier">sort</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">x</span>,<span class="ruby-identifier">y</span><span class="ruby-operator">|</span> <span class="ruby-identifier">x</span>.<span class="ruby-identifier">name</span> <span class="ruby-operator">&lt;=&gt;</span> <span class="ruby-identifier">y</span>.<span class="ruby-identifier">name</span> }
+        <span class="ruby-identifier">mappings</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">mapping</span><span class="ruby-operator">|</span>        
+          <span class="ruby-identifier">analyzer</span> = <span class="ruby-identifier">mapping</span>.<span class="ruby-identifier">analyzer</span>
+          <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">analyzer</span> <span class="ruby-operator">!=</span> <span class="ruby-keyword kw">nil</span>
+            <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Analyzers</span>.<span class="ruby-identifier">constants</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">c</span><span class="ruby-operator">|</span>
+              <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">analyzer</span> <span class="ruby-operator">==</span> <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Analyzers</span>.<span class="ruby-identifier">const_get</span>(<span class="ruby-identifier">c</span>)
+                <span class="ruby-identifier">analyzer</span> = <span class="ruby-identifier">c</span>
+              <span class="ruby-keyword kw">end</span>
+            <span class="ruby-keyword kw">end</span>
+          <span class="ruby-keyword kw">end</span>
+          <span class="ruby-identifier">out</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;#{mapping.name} -&gt; #{mapping.property_uri}&quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">analyzer</span> <span class="ruby-operator">==</span> <span class="ruby-keyword kw">nil</span>
+          <span class="ruby-identifier">out</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;#{mapping.name} -&gt; #{mapping.property_uri} (#{mapping.analyzer})&quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">analyzer</span> <span class="ruby-operator">!=</span> <span class="ruby-keyword kw">nil</span>
+        <span class="ruby-keyword kw">end</span> 
+      
+      <span class="ruby-keyword kw">end</span>
+            
+    <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000114" class="method-detail">
+        <a name="M000114"></a>
+
+        <div class="method-heading">
+          <a href="#M000114" class="method-signature">
+          <span class="method-name">password</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000114-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000114-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 31</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">password</span>()
+     <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;password&quot;</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;password&quot;</span>]
+     <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@env</span>[<span class="ruby-value str">&quot;TALIS_PASS&quot;</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@env</span>[<span class="ruby-value str">&quot;TALIS_PASS&quot;</span>]
+     <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>  
+    <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000127" class="method-detail">
+        <a name="M000127"></a>
+
+        <div class="method-heading">
+          <a href="#M000127" class="method-signature">
+          <span class="method-name">queryprofile</span><span class="method-args">(out=$stdout)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000127-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000127-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 232</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">queryprofile</span>(<span class="ruby-identifier">out</span>=<span class="ruby-identifier">$stdout</span>)
+
+      <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;raw&quot;</span>]
+        <span class="ruby-identifier">resp</span> = <span class="ruby-ivar">@store</span>.<span class="ruby-identifier">get_query_profile</span>(<span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">ACCEPT_RDF</span>)        
+        <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">resp</span>.<span class="ruby-identifier">status</span> <span class="ruby-operator">!=</span> <span class="ruby-value">200</span>
+          <span class="ruby-identifier">out</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Unable to read Query Profile from store. Response code was #{resp.status}&quot;</span>
+        <span class="ruby-keyword kw">else</span>
+          <span class="ruby-identifier">out</span>.<span class="ruby-identifier">puts</span> <span class="ruby-identifier">resp</span>.<span class="ruby-identifier">content</span>
+        <span class="ruby-keyword kw">end</span>
+      <span class="ruby-keyword kw">else</span>  
+        <span class="ruby-identifier">queryprofile</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">QueryProfile</span>.<span class="ruby-identifier">read_from_store</span>(<span class="ruby-ivar">@store</span>)
+        <span class="ruby-identifier">field_weights</span> = <span class="ruby-identifier">queryprofile</span>.<span class="ruby-identifier">field_weights</span>()
+        <span class="ruby-identifier">field_weights</span> = <span class="ruby-identifier">field_weights</span>.<span class="ruby-identifier">sort</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">x</span>,<span class="ruby-identifier">y</span><span class="ruby-operator">|</span> <span class="ruby-identifier">x</span>.<span class="ruby-identifier">name</span> <span class="ruby-operator">&lt;=&gt;</span> <span class="ruby-identifier">y</span>.<span class="ruby-identifier">name</span> }
+        <span class="ruby-identifier">field_weights</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">weighting</span><span class="ruby-operator">|</span>
+          <span class="ruby-identifier">out</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;#{weighting.name} -&gt; #{weighting.weight}&quot;</span>
+        <span class="ruby-keyword kw">end</span>      
+      <span class="ruby-keyword kw">end</span>
+            
+    <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000119" class="method-detail">
+        <a name="M000119"></a>
+
+        <div class="method-heading">
+          <a href="#M000119" class="method-signature">
           <span class="method-name">reindex</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000112-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000112-source">
+            onclick="toggleCode('M000119-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000119-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 41</span>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 77</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reindex</span>()
-      <span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;Submitting Reindex Job&quot;</span>
+      <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Submitting Reindex Job to Store #{@store.storeuri}&quot;</span>
       <span class="ruby-identifier">resp</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Jobs</span>.<span class="ruby-identifier">submit_reindex</span>(<span class="ruby-ivar">@store</span>, <span class="ruby-value str">&quot;Reindex&quot;</span>, <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>)
       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">resp</span>.<span class="ruby-identifier">status</span> <span class="ruby-operator">==</span> <span class="ruby-value">201</span>
           <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Monitoring Reindex Job: #{resp.header[&quot;Location&quot;].first}&quot;</span>
@@ -244,25 +449,25 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000113" class="method-detail">
-        <a name="M000113"></a>
+      <div id="method-M000120" class="method-detail">
+        <a name="M000120"></a>
 
         <div class="method-heading">
-          <a href="#M000113" class="method-signature">
+          <a href="#M000120" class="method-signature">
           <span class="method-name">reset</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000113-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000113-source">
+            onclick="toggleCode('M000120-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000120-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 53</span>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 89</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reset</span>()
-      <span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;Resetting Store&quot;</span>
+      <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Resetting Store #{@store.storeuri}&quot;</span>
       <span class="ruby-identifier">resp</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Jobs</span>.<span class="ruby-identifier">submit_reset</span>(<span class="ruby-ivar">@store</span>, <span class="ruby-value str">&quot;Reset&quot;</span>, <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>)
-      <span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;Monitoring Reset Job:&quot;</span>
+      <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Monitoring Reset Job: #{resp.header[&quot;Location&quot;].first}&quot;</span>
       <span class="ruby-identifier">job</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Jobs</span>.<span class="ruby-identifier">wait_for_submitted</span>(<span class="ruby-identifier">resp</span>, <span class="ruby-ivar">@store</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">job</span>, <span class="ruby-identifier">message</span>, <span class="ruby-identifier">time</span><span class="ruby-operator">|</span>
         <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;#{time} #{message}&quot;</span>
       <span class="ruby-keyword kw">end</span> 
@@ -273,30 +478,31 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000114" class="method-detail">
-        <a name="M000114"></a>
+      <div id="method-M000121" class="method-detail">
+        <a name="M000121"></a>
 
         <div class="method-heading">
-          <a href="#M000114" class="method-signature">
+          <a href="#M000121" class="method-signature">
           <span class="method-name">restore</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000114-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000114-source">
+            onclick="toggleCode('M000121-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000121-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 63</span>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 99</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">restore</span>()
       <span class="ruby-identifier">url</span> = <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;url&quot;</span>]     
       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">url</span> <span class="ruby-operator">==</span> <span class="ruby-keyword kw">nil</span>
-        <span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;Restore from latest snapshot&quot;</span>
+        <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Restoring #{@store.storeuri} from latest snapshot&quot;</span>
         <span class="ruby-identifier">snapshot</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Snapshot</span>.<span class="ruby-identifier">read_from_store</span>(<span class="ruby-ivar">@store</span>)
         <span class="ruby-identifier">url</span> = <span class="ruby-identifier">snapshot</span>.<span class="ruby-identifier">url</span>
       <span class="ruby-keyword kw">end</span>
       <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Restoring from #{url}&quot;</span>    
       <span class="ruby-identifier">resp</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Jobs</span>.<span class="ruby-identifier">submit_restore</span>(<span class="ruby-ivar">@store</span>, <span class="ruby-identifier">url</span>, <span class="ruby-value str">&quot;Reset&quot;</span>, <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>)
+      <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Monitoring Restore Job: #{resp.header[&quot;Location&quot;].first}&quot;</span>
       <span class="ruby-identifier">job</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Jobs</span>.<span class="ruby-identifier">wait_for_submitted</span>(<span class="ruby-identifier">resp</span>, <span class="ruby-ivar">@store</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">job</span>, <span class="ruby-identifier">message</span>, <span class="ruby-identifier">time</span><span class="ruby-operator">|</span>
         <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;#{time} #{message}&quot;</span>
       <span class="ruby-keyword kw">end</span> 
@@ -307,25 +513,25 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000111" class="method-detail">
-        <a name="M000111"></a>
+      <div id="method-M000118" class="method-detail">
+        <a name="M000118"></a>
 
         <div class="method-heading">
-          <a href="#M000111" class="method-signature">
+          <a href="#M000118" class="method-signature">
           <span class="method-name">snapshot</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000111-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000111-source">
+            onclick="toggleCode('M000118-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000118-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 31</span>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 67</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">snapshot</span>()
-      <span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;Submitting Snapshot Job&quot;</span>
+      <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Submitting Snapshot Job to Store #{@store.storeuri}&quot;</span>
       <span class="ruby-identifier">resp</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Jobs</span>.<span class="ruby-identifier">submit_snapshot</span>(<span class="ruby-ivar">@store</span>, <span class="ruby-value str">&quot;Reindex&quot;</span>, <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>)
-      <span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;Monitoring Job&quot;</span>
+      <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Monitoring Snapshot Job #{resp.header[&quot;Location&quot;].first}&quot;</span>
       <span class="ruby-identifier">job</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Jobs</span>.<span class="ruby-identifier">wait_for_submitted</span>(<span class="ruby-identifier">resp</span>, <span class="ruby-ivar">@store</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">job</span>, <span class="ruby-identifier">message</span>, <span class="ruby-identifier">time</span><span class="ruby-operator">|</span>
         <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;#{time} #{message}&quot;</span>
       <span class="ruby-keyword kw">end</span> 
@@ -336,21 +542,21 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000116" class="method-detail">
-        <a name="M000116"></a>
+      <div id="method-M000123" class="method-detail">
+        <a name="M000123"></a>
 
         <div class="method-heading">
-          <a href="#M000116" class="method-signature">
+          <a href="#M000123" class="method-signature">
           <span class="method-name">sparql</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000116-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000116-source">
+            onclick="toggleCode('M000123-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000123-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 88</span>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 125</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">sparql</span>()
       <span class="ruby-identifier">query</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;file&quot;</span>] ).<span class="ruby-identifier">read</span>()
       <span class="ruby-identifier">resp</span> = <span class="ruby-ivar">@store</span>.<span class="ruby-identifier">sparql</span>(<span class="ruby-identifier">query</span>)
@@ -366,45 +572,45 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000109" class="method-detail">
-        <a name="M000109"></a>
+      <div id="method-M000116" class="method-detail">
+        <a name="M000116"></a>
 
         <div class="method-heading">
-          <a href="#M000109" class="method-signature">
+          <a href="#M000116" class="method-signature">
           <span class="method-name">status</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000109-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000109-source">
+            onclick="toggleCode('M000116-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000116-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 11</span>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 47</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">status</span>()
       <span class="ruby-identifier">status</span> = <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">Status</span>.<span class="ruby-identifier">read_from_store</span>(<span class="ruby-ivar">@store</span>)
-      <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Store Status:\nReadable: #{status.readable?}\nWritable: #{status.writeable?}&quot;</span>      
+      <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Status of Store #{@store.storeuri}:\nReadable: #{status.readable?}\nWritable: #{status.writeable?}&quot;</span>      
     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000117" class="method-detail">
-        <a name="M000117"></a>
+      <div id="method-M000124" class="method-detail">
+        <a name="M000124"></a>
 
         <div class="method-heading">
-          <a href="#M000117" class="method-signature">
+          <a href="#M000124" class="method-signature">
           <span class="method-name">store</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000117-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000117-source">
+            onclick="toggleCode('M000124-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000124-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 99</span>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 136</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store</span>()
       <span class="ruby-identifier">resp</span> = <span class="ruby-keyword kw">nil</span>
       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;url&quot;</span>]
@@ -414,7 +620,9 @@ Class that implements the command-line behaviour
         <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Storing local file: #{@opts[&quot;file&quot;]}&quot;</span>
         <span class="ruby-identifier">f</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;file&quot;</span>] )
         <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">extname</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;file&quot;</span>] ) <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;.nt&quot;</span>
-          <span class="ruby-constant">Pho</span><span class="ruby-operator">::</span><span class="ruby-constant">RDF</span><span class="ruby-operator">::</span><span class="ruby-constant">Parser</span>.<span class="ruby-identifier">store_ntriples</span>(<span class="ruby-identifier">f</span>, <span class="ruby-ivar">@store</span>)
+          <span class="ruby-identifier">resp</span> = <span class="ruby-ivar">@store</span>.<span class="ruby-identifier">store_file</span>( <span class="ruby-identifier">f</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-value str">&quot;text/plain&quot;</span> )
+        <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">extname</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;file&quot;</span>] ) <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;.ttl&quot;</span>
+          <span class="ruby-identifier">resp</span> = <span class="ruby-ivar">@store</span>.<span class="ruby-identifier">store_file</span>( <span class="ruby-identifier">f</span>, <span class="ruby-keyword kw">nil</span>, <span class="ruby-value str">&quot;text/turtle&quot;</span> )
         <span class="ruby-keyword kw">else</span>
           <span class="ruby-identifier">resp</span> = <span class="ruby-ivar">@store</span>.<span class="ruby-identifier">store_file</span>( <span class="ruby-identifier">f</span> )  
         <span class="ruby-keyword kw">end</span>          
@@ -441,27 +649,56 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
-      <div id="method-M000118" class="method-detail">
-        <a name="M000118"></a>
+      <div id="method-M000115" class="method-detail">
+        <a name="M000115"></a>
 
         <div class="method-heading">
-          <a href="#M000118" class="method-signature">
+          <a href="#M000115" class="method-signature">
+          <span class="method-name">storename</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000115-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000115-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 37</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">storename</span>()      
+      <span class="ruby-identifier">store</span> = <span class="ruby-keyword kw">nil</span>
+      <span class="ruby-identifier">store</span> = <span class="ruby-ivar">@env</span>[<span class="ruby-value str">&quot;TALIS_STORE&quot;</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@env</span>[<span class="ruby-value str">&quot;TALIS_STORE&quot;</span>]
+      <span class="ruby-identifier">store</span> = <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;store&quot;</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;store&quot;</span>]
+      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">store</span> <span class="ruby-operator">!=</span> <span class="ruby-keyword kw">nil</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-identifier">store</span>.<span class="ruby-identifier">start_with?</span>(<span class="ruby-value str">&quot;http&quot;</span>)
+          <span class="ruby-identifier">store</span> = <span class="ruby-node">&quot;http://api.talis.com/stores/#{store}&quot;</span>  
+      <span class="ruby-keyword kw">end</span>
+      <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">store</span>      
+    <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000125" class="method-detail">
+        <a name="M000125"></a>
+
+        <div class="method-heading">
+          <a href="#M000125" class="method-signature">
           <span class="method-name">upload</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000118-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000118-source">
+            onclick="toggleCode('M000125-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000125-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 131</span>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 170</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">upload</span>()
       <span class="ruby-identifier">resp</span> = <span class="ruby-keyword kw">nil</span>
       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;file&quot;</span>]
         <span class="ruby-identifier">f</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">new</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;file&quot;</span>] )
         <span class="ruby-identifier">uri</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;file&quot;</span>] )
-        <span class="ruby-identifier">uri</span> = <span class="ruby-node">&quot;#{opts[&quot;base&quot;]}/#{uri}&quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;base&quot;</span>]            
+        <span class="ruby-identifier">uri</span> = <span class="ruby-node">&quot;#{@opts[&quot;base&quot;]}/#{uri}&quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;base&quot;</span>]            
         <span class="ruby-identifier">mime</span> = <span class="ruby-constant">MIME</span><span class="ruby-operator">::</span><span class="ruby-constant">Types</span>.<span class="ruby-identifier">type_for</span>( <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;file&quot;</span>] )[<span class="ruby-value">0</span>].<span class="ruby-identifier">to_s</span>
         <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Uploading file: #{ @opts[&quot;file&quot;] } to /items/#{ uri } as #{mime}&quot;</span>
         <span class="ruby-identifier">resp</span> = <span class="ruby-ivar">@store</span>.<span class="ruby-identifier">upload_item</span>( <span class="ruby-identifier">f</span> , <span class="ruby-identifier">mime</span> , <span class="ruby-identifier">uri</span> )
@@ -493,6 +730,31 @@ Class that implements the command-line behaviour
         </div>
       </div>
 
+      <div id="method-M000113" class="method-detail">
+        <a name="M000113"></a>
+
+        <div class="method-heading">
+          <a href="#M000113" class="method-signature">
+          <span class="method-name">username</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000113-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000113-source">
+<pre>
+<span class="ruby-comment cmt"># File lib/pho/command_line.rb, line 25</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">username</span>()
+     <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;username&quot;</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@opts</span>[<span class="ruby-value str">&quot;username&quot;</span>]
+     <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@env</span>[<span class="ruby-value str">&quot;TALIS_USER&quot;</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@env</span>[<span class="ruby-value str">&quot;TALIS_USER&quot;</span>]
+     <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>  
+    <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
 
     </div>