so query

benkamphaus · benkamphaus · commit 91db87b80d25 · 2015-01-14T14:58:27.000-07:00
diff --git a/src/java/datomic/samples/Query.java b/src/java/datomic/samples/Query.java
@@ -117,24 +117,14 @@ public static void main(String[] args) {
         System.out.println(year);
         pause();
 
-        System.out.println("Total number of artists without :artist/country attribute.");
+        System.out.println("Total number of artists who aren't Canadian.");
         Integer res = Peer.query("[:find (count ?eid) . " +
                                   ":where [?eid :artist/name] " +
-                                         "(not [?eid :artist/country])]",
+                                         "(not [?eid :artist/country :country/CA])]",
                                  db);
         System.out.println(res);
         pause();
 
-        System.out.println("Number of artists missing either country or gender. "+
-                           "(negation of conjunction reads 'not (clause1 and clause2)'");
-        res = Peer.query("[:find (count ?eid) . " +
-                          ":where [?eid :artist/name] " +
-                                 "(not [?eid :artist/country] " +
-                                      "[?eid :artist/gender])]",
-                         db);
-        System.out.println(res);
-        pause();
-
         System.out.println("Use not-join to bind variable in subquery. Artists w/o releases in 1970.");
         res = Peer.query("[:find (count ?artist) . " +
                           ":where [?artist :artist/name] " +
@@ -145,6 +135,16 @@ public static void main(String[] args) {
         System.out.println(res);
         pause();
 
+        System.out.println("Number of 'Live at Carnegie Hall' releases not by Bill Withers");
+        res = Peer.query("[:find (count ?r) . " +
+                          ":where [?r :release/name \"Live at Carnegie Hall\"] " +
+                                 "(not-join [?r] " +
+                                   "[?r :release/artists ?a] " +
+                                   "[?a :artist/name \"Bill Withers\"])]",
+                         db);
+        System.out.println(res);
+        pause();
+
         System.out.println("Total of artists who are a group or female by use of 'or'.");
         res = Peer.query("[:find (count ?artist) . " +
                          " :where (or [?artist :artist/type :artist.type/group] " +
