[Fencommits] fenserve: adjust to new Fenfire.RDF.query API

[Benja Fallenstein]

Wed Apr  4 11:12:04 EEST 2007  Benja Fallenstein <benja.fallenstein at gmail.com>
  * adjust to new Fenfire.RDF.query API
diff -rN -u old-fenserve/FenServe.hs new-fenserve/FenServe.hs
--- old-fenserve/FenServe.hs	2007-04-04 11:12:12.000000000 +0300
+++ new-fenserve/FenServe.hs	2007-04-04 11:12:12.000000000 +0300
@@ -114,12 +114,12 @@
         
 instance FromRDF Directory where
     readRDF g node = do
-        let l = query (node, fs_entries, X) g
+        let l = query' (node, fs_entries, X) g
         tellTs [ (node, rdf_type, fs_Directory), (node, fs_entries, l) ]
         entries <- readRDFList readRDFEntry g l
         return $ Dir node entries 
       where readRDFEntry g n = do 
-              let nameR = query (n, fs_filename, X) g
+              let nameR = query' (n, fs_filename, X) g
               name <- readRDF g nameR; entry <- readRDF g n
               tellTs [ (n, fs_filename, nameR) ]; return (name, entry)
         
@@ -138,17 +138,17 @@
         return e
         
 instance FromRDF Entry where
-    readRDF g node = case query (node, rdf_type, X) g of
+    readRDF g node = case query' (node, rdf_type, X) g of
         x | x == fs_FileEntry -> do
-            let repr = query (node, fs_representation, X) g
+            let repr = query' (node, fs_representation, X) g
             tellTs [ (node, fs_representation, repr) ]
             return $ FileEntry repr
         x | x == fs_DirEntry -> do
-            let subdir = query (node, fs_subdir, X) g
+            let subdir = query' (node, fs_subdir, X) g
             tellTs [ (node, fs_subdir, subdir) ]
             return $ DirEntry subdir
         x | x == fs_ExecutableEntry -> do
-            let code = query (node, fs_code, X) g
+            let code = query' (node, fs_code, X) g
             tellTs [ (node, fs_subdir, code) ]
             return $ ExecutableEntry code