Changeset 8872 for trunk/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/ProfileStore.java

Timestamp:

2004-12-21T16:18:32+13:00 (19 years ago)

Author:

schweer

Message:

started to use constants instead of strings

File:

• trunk/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/ProfileStore.java (modified) (4 diffs)

trunk/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/ProfileStore.java

@@ -54 +54 @@
      */
     private void addSubscription(Subscription subscription) {
-        List documentIdPredicate = subscription.getPredicateList("documentID");
-        List collectionIdPredicate = subscription.getPredicateList("collectionID");
-        List hostIdPredicate = subscription.getPredicateList("hostID");
-        List typePredicate = subscription.getPredicateList("type");
+        List documentIdPredicate = subscription.getPredicateList(Constants.DOCUMENT_ID_FIELD);
+        List collectionIdPredicate = subscription.getPredicateList(Constants.COLLECTION_ID_FIELD);
+        List hostIdPredicate = subscription.getPredicateList(Constants.HOST_ID_FIELD);
+        List typePredicate = subscription.getPredicateList(Constants.TYPE_FIELD);
         
         Integer subId = new Integer(subscription.getId());
         
         if (documentIdPredicate.isEmpty()) {
-            if (!dontCareSubscriptions.containsKey("documentID")) {
-                dontCareSubscriptions.put("documentID", new TreeSet());
-            }
-            Set list = (Set) dontCareSubscriptions.get("documentID");
+            if (!dontCareSubscriptions.containsKey(Constants.DOCUMENT_ID_FIELD)) {
+                dontCareSubscriptions.put(Constants.DOCUMENT_ID_FIELD, new TreeSet());
+            }
+            Set list = (Set) dontCareSubscriptions.get(Constants.DOCUMENT_ID_FIELD);
             list.add(subId);
         }
         if (collectionIdPredicate.isEmpty()) {
-            if (!dontCareSubscriptions.containsKey("collectionID")) {
-                dontCareSubscriptions.put("collectionID", new TreeSet());
-            }
-            Set list = (Set) dontCareSubscriptions.get("collectionID");
+            if (!dontCareSubscriptions.containsKey(Constants.COLLECTION_ID_FIELD)) {
+                dontCareSubscriptions.put(Constants.COLLECTION_ID_FIELD, new TreeSet());
+            }
+            Set list = (Set) dontCareSubscriptions.get(Constants.COLLECTION_ID_FIELD);
             list.add(subId);
         }
         if (hostIdPredicate.isEmpty()) {
-            if (!dontCareSubscriptions.containsKey("hostID")) {
-                dontCareSubscriptions.put("hostID", new TreeSet());
-            }
-            Set list = (Set) dontCareSubscriptions.get("hostID");
+            if (!dontCareSubscriptions.containsKey(Constants.HOST_ID_FIELD)) {
+                dontCareSubscriptions.put(Constants.HOST_ID_FIELD, new TreeSet());
+            }
+            Set list = (Set) dontCareSubscriptions.get(Constants.HOST_ID_FIELD);
             list.add(subId);
         }
         if (typePredicate.isEmpty()) {
-            if (!dontCareSubscriptions.containsKey("type")) {
-                dontCareSubscriptions.put("type", new TreeSet());
-            }
-            Set list = (Set) dontCareSubscriptions.get("type");
+            if (!dontCareSubscriptions.containsKey(Constants.TYPE_FIELD)) {
+                dontCareSubscriptions.put(Constants.TYPE_FIELD, new TreeSet());
+            }
+            Set list = (Set) dontCareSubscriptions.get(Constants.TYPE_FIELD);
             list.add(subId);
         }
@@ -113 +113 @@
         // TODO rework algo for getting partially matched subs
         IdEqualsPredicate predicate;
-        predicate = PredicateFactory.getIdEqualsPredicate("type", (String)event.get("type"));
+        predicate = PredicateFactory.getIdEqualsPredicate(Constants.TYPE_FIELD, 
+                (String)event.get(Constants.TYPE_FIELD));
         if (predicate != null)
             result.addAll(predicate.getSubscriptionIDs());
         
         Set docIDSubs = new TreeSet();
-        predicate = PredicateFactory.getIdEqualsPredicate("documentID", (String)event.get("documentID"));
+        predicate = PredicateFactory.getIdEqualsPredicate(Constants.DOCUMENT_ID_FIELD, 
+                (String)event.get(Constants.DOCUMENT_ID_FIELD));
         if (predicate != null)
             docIDSubs.addAll(predicate.getSubscriptionIDs());
-        docIDSubs.addAll(getDontCareSubscriptions("documentID"));
+        docIDSubs.addAll(getDontCareSubscriptions(Constants.DOCUMENT_ID_FIELD));
         result.retainAll(docIDSubs);
         
         Set collIDSubs = new TreeSet();
-        predicate = PredicateFactory.getIdEqualsPredicate("collectionID", (String)event.get("collectionID"));
+        predicate = PredicateFactory.getIdEqualsPredicate(Constants.COLLECTION_ID_FIELD, 
+                (String)event.get(Constants.COLLECTION_ID_FIELD));
         if (predicate != null)
             collIDSubs.addAll(predicate.getSubscriptionIDs());
-        collIDSubs.addAll(getDontCareSubscriptions("collectionID"));
+        collIDSubs.addAll(getDontCareSubscriptions(Constants.COLLECTION_ID_FIELD));
         result.retainAll(collIDSubs);
         
         Set hostIDSubs = new TreeSet();
-        predicate = PredicateFactory.getIdEqualsPredicate("hostID", (String)event.get("hostID"));
+        predicate = PredicateFactory.getIdEqualsPredicate(Constants.HOST_ID_FIELD, 
+                (String)event.get(Constants.HOST_ID_FIELD));
         if (predicate != null)
             hostIDSubs.addAll(predicate.getSubscriptionIDs());
-        hostIDSubs.addAll(getDontCareSubscriptions("hostID"));
+        hostIDSubs.addAll(getDontCareSubscriptions(Constants.HOST_ID_FIELD));
         result.retainAll(hostIDSubs);
         
@@ -154 +158 @@
         // predicate is matched iff the docID occurs in the query result
         
-        for (Iterator iter = PredicateFactory.getQueryPredicates("document_content").iterator(); iter.hasNext();) {
+        for (Iterator iter = PredicateFactory.getQueryPredicates(Constants.DOCUMENT_CONTENT_FIELD).iterator(); iter.hasNext();) {
             Predicate predicate = (Predicate) iter.next();
-            String collection = (String) event.get("collectionID");
+            String collection = (String) event.get(Constants.COLLECTION_ID_FIELD);
             String query = predicate.getValue();
             Set results;
             try {
                 results = gsComm.fullTextSearch(collection, query);
-                if (results.contains(event.get("documentID"))) {
+                if (results.contains(event.get(Constants.DOCUMENT_ID_FIELD))) {
                     matchedPreds.add(predicate);
                 }
@@ -368 +372 @@
                 ResultSet predicates = stmnt.executeQuery(sqlString);
                 while (predicates.next()) {
-                    String type = predicates.getString("type");
+                    String type = predicates.getString(Constants.TYPE_FIELD);
                     String field = predicates.getString("field");
                     if (type.equals(SubstringMatchPredicate.class.getName())) {
-                        if (field.equals("colletionID")) {
-                            field = "collection_query";
-                        } else if (field.equals("hostID")) {
-                            field = "host_query";
+                        if (field.equals(Constants.COLLECTION_ID_FIELD)) {
+                            field = Constants.COLLECTION_QUERY_FIELD;
+                        } else if (field.equals(Constants.HOST_ID_FIELD)) {
+                            field = Constants.HOST_QUERY_FIELD;
                         }
                     }