Suports intermediate nodes as variables

rac021 · Nov 5, 2016 · d1e9e26 · d1e9e26
1 parent 7be6830
commit d1e9e26
Showing 1 changed file with 26 additions and 11 deletions.
diff --git a/src/main/java/org/inra/yedodba/Processor.java b/src/main/java/org/inra/yedodba/Processor.java
@@ -687,15 +687,29 @@ private void write(  String outFile ) throws Exception {
                         )
                 ) {
 
-                    if(!sujet.getType().startsWith(":"))      {
-
-                        target.put( tmpUris.get(sujet.getHash())  ,
-                                tmpUris.get(sujet.getHash())           +
-                                        " a " +  PREFIX_PREDICAT + ":" +
-                                        sujet.getType() + " ; "    +
-                                        objectProperty  +  " "         +
-                                        objet.getLabel() )             ;
+                    if(!sujet.getType().startsWith(":") && !sujet.getType().startsWith("?"))  {
+
+                        if(objet.getLabel().startsWith("?") && objet.getCode() >  0 ) {
+
+                            target.put( tmpUris.get(sujet.getHash())  ,
+                                    tmpUris.get(sujet.getHash())           +
+                                            " a " +  PREFIX_PREDICAT + ":" +
+                                            sujet.getType() + " ; "    +
+                                            objectProperty  +  " :"         +
+                                            tmpUris.get(objet.getHash()) )             ;
+                        }
+
+                        else {
+
+                            target.put( tmpUris.get(sujet.getHash())  ,
+                                    tmpUris.get(sujet.getHash())           +
+                                            " a " +  PREFIX_PREDICAT + ":" +
+                                            sujet.getType() + " ; "    +
+                                            objectProperty  +  " "         +
+                                            objet.getLabel() )             ;
+                        }
                     }
+
                     else {
 
                         target.put( tmpUris.get(sujet.getHash())   ,
@@ -1156,9 +1170,10 @@ private List<String> getOutForPattern( String patternId ) {
                           .replace("?id", keyByURI+"_"+classe+ "_"+num_start++ )
                           .replace("?target"  ,  uri + " a " + type + " ; " +
                            OF_ENTITY_PATTERN + " :" + classe + " ; " + 
-                           target.get(MATCHER_PATTERN_CONTEXT).replace("_+_  .", ".") )
-                          .replace(" _+_ ", " ; ")
-                          .replace("?source"  , query )
+                           target.getOrDefault(MATCHER_PATTERN_CONTEXT, "")
+                                 .replace("_+_  .", ".") )
+                                 .replace(" _+_ ", " ; ")
+                                 .replace("?source"  , query )
                   ) ;
             }