Changeset 8921

Timestamp:

10/04/08 22:29:28 (7 weeks ago)

Author:

leosauermann

Message:

pimoservice: pimo:hasFolder is now considered similar to pimo:hasReferencingOccurrence in the methods of findThingForOccurrence

Location:

trunk/java/org.semanticdesktop.nepomuk.comp.pimoservice/src/org/semanticdesktop/nepomuk/comp/pimoservice/client

Files:

• ClientSession.java (modified) (3 diffs)
• impl/PimoQueryImpl.java (modified) (1 diff)

trunk/java/org.semanticdesktop.nepomuk.comp.pimoservice/src/org/semanticdesktop/nepomuk/comp/pimoservice/client/ClientSession.java

@@ -62 +62 @@
 import org.semanticdesktop.services.vocabulary.NAO;
 import org.semanticdesktop.services.vocabulary.NRL;
+import org.semanticdesktop.services.vocabulary.NepomukConstants;
 import org.semanticdesktop.services.vocabulary.PIMO;
 
@@ -1972 +1973 @@
 
     /**
-         * gets all things which have informationElement as occourrence or grounding occurrence
+         * gets all things which have informationElement as occourrence or grounding occurrence (and as folder!)
          * @return the URI of the resource, which has informationElement as occourence.
          */
@@ -2596 +2597 @@
      */
     public boolean isEditingAllowed(URI context) throws NotFoundException {
+        // well, the crappy inferencing sail model is always editable somehow ... this line keeps trouble out.
+        if (NepomukConstants.INFERRED_GRAPH.equals(context))
+                return true;
         // have I been asked before?
         Boolean b = ontologyIsWriteable.get(context.toString());

trunk/java/org.semanticdesktop.nepomuk.comp.pimoservice/src/org/semanticdesktop/nepomuk/comp/pimoservice/client/impl/PimoQueryImpl.java

@@ -570 +570 @@
      */
     public URI findThingForOccurrence(URI informationElement) {
-        return findThingForOccurrence(informationElement, true, true, true, true);
-        /*ClosableIterator<? extends Statement> iterator = null;
-        Set<URI> result = new HashSet<URI>();
-        boolean open = mainRepository.isOpen();
-        if (!open)
-            mainRepository.open();
-        iterator = mainRepository.findStatements(Variable.ANY,Variable.ANY, PIMO.occurrence, informationElement);
-        try {
-            while (iterator.hasNext()) {
-                Node node = iterator.next().getSubject();
-                if (node instanceof URI) {
-                    result.add(node.asURI());
-                } else {
-                    log.finer(node+" is no instance of an URI");
-                }
-            }
-        } finally {
-            iterator.close();
-        }
-        iterator = mainRepository.findStatements(Variable.ANY,Variable.ANY, PIMO.groundingOccurrence, informationElement);
-        try {
-            while (iterator.hasNext()) {
-                Node node = iterator.next().getSubject();
-                if (node instanceof URI) {
-                    result.add(node.asURI());
-                } else {
-                    log.finer(node+" is no instance of an URI");
-                }
-            }
-        } finally {
-            iterator.close();
-        }
-        // check if they are things
-        for (Iterator<URI> i = result.iterator(); i.hasNext();) {
-            URI u = i.next();
-            if (!mainRepository.containsStatements(Variable.ANY, u, PIMO.isDefinedBy, pimoClient.getPimoUri())) {
-                i.remove();
-            }
-        }
-//        if (!open)
-//            mainRepository.close();
-        if (result.size() > 1) log.severe("More then one thing: "+result.toString()+" found for the occurence "+informationElement);
-        if (result.size() == 0) return null;
-        return result.iterator().next();*/
+        URI result = findThingForOccurrence(informationElement, true, true, true, true);
+        // the "folder" case is not handled by the other method, hence here.
+        if (result == null) {
+                ClosableIterator<Statement> it = mainRepository.findStatements(Variable.ANY, Variable.ANY, PIMO.hasFolder, informationElement);
+                if (it.hasNext())
+                        result=it.next().getSubject().asURI();
+                it.close();
+        }
+        return result;
     }