[Yanel-commits] rev 22602 - public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation

[michi at wyona.com]

Author: michi
Date: 2007-02-13 10:54:11 +0100 (Tue, 13 Feb 2007)
New Revision: 22602

Modified:
   public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeRTIImpl.java
Log:
is resource check fixed

Modified: public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeRTIImpl.java
===================================================================
--- public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeRTIImpl.java	2007-02-13 08:09:08 UTC (rev 22601)
+++ public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeRTIImpl.java	2007-02-13 09:54:11 UTC (rev 22602)
@@ -18,6 +18,7 @@
 
 import org.wyona.yanel.core.navigation.Node;
 
+import org.wyona.yarep.core.NoSuchNodeException;
 import org.wyona.yarep.core.Path;
 import org.wyona.yarep.core.Repository;
 
@@ -79,7 +80,21 @@
      */
     public boolean isResource() {
         if (isCollection()) return false;
-        return true;
+        try {
+            if (repo.getNode(path.toString() + ".yanel-rti").isResource()) return true;
+        } catch (NoSuchNodeException e) {
+            log.warn("No such node exception: " + path + ".yanel-rti");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        try {
+            if (repo.getNode(path.toString() + ".yanel-rc").isResource()) return true;
+        } catch (NoSuchNodeException e) {
+            log.warn("No such node exception: " + path + ".yanel-rc");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return false;
     }
 
     /**
@@ -87,7 +102,7 @@
      */
     public boolean isCollection() {
         try {
-            log.error("DEBUG: Check if node is a collection: " + path);
+            log.debug("Check if node is a collection: " + path);
             if (repo.getNode(path.toString()).isCollection()) {
             //if (repo.isCollection(path)) {
                 log.error("DEBUG: Is collection within repo: " + path);
@@ -104,6 +119,9 @@
                     }
                 }
             }
+        } catch(NoSuchNodeException e) {
+            log.warn("No such node exception: " + path);
+            return false;
         } catch(Exception e) {
             log.error(e.getMessage(), e);
         }