NIHVIVO-1558 correcting lack of inferred types with SDB and removing redundant label-based filtering

webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java

@@ -905,10 +905,6 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
                 while (allIndIt.hasNext()) {
                     com.hp.hpl.jena.ontology.Individual ind = allIndIt.next();
                     
-                    //don't include anything that lacks a label, issue VIVO-119.
-                    if( getLabel(ind) == null )
-                        continue;
-                    
                     boolean userVisible = true;
                     //Check for non-user visible types, maybe this should be an annotation?
                     ClosableIterator<Resource> typeIt = ind.listRDFTypes(false);

webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java

@@ -139,11 +139,11 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     	    		 "{ GRAPH ?g { \n" +
     	    		 	"{ <"+individualURI+">  <" + RDFS.label.getURI() + 
     	    		 	        "> ?ooo } \n" +
-    	    		 	"UNION { <" +
+    	    		 	"UNION { GRAPH ?h { <" +
     	    		 	    individualURI+">  <" + VitroVocabulary.MONIKER + 
-    	    		 	        "> ?moniker } \n" +
+    	    		 	        "> ?moniker } } \n" +
     	    		 	"} } \n" +
-    	    		 	"UNION { GRAPH <http://vitro.mannlib.cornell.edu/default/vitro-kb-2> { <"
+    	    		 	"UNION { GRAPH ?i { <"
     	    		 	    + individualURI + "> a ?type } } \n" +
     	    		 "}";
         		model = QueryExecutionFactory.create(