[Tmapi-utils-commits] tmapi-utils/src/org/tmapiutils/query/tolog/predicates ValuePredicate.java,1.2,1.3

[Lars H. <lh...@us...>]

Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5391/src/org/tmapiutils/query/tolog/predicates

Modified Files:
	ValuePredicate.java 
Log Message:
Replaced VariantContainer with TopicName

Index: ValuePredicate.java
===================================================================
RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/ValuePredicate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ValuePredicate.java	7 Mar 2005 12:32:00 -0000	1.2
--- ValuePredicate.java	7 Mar 2005 16:17:20 -0000	1.3
***************
*** 20,24 ****
  import org.tmapiutils.query.tolog.utils.VariableSet;
  
- import org.tmapiutils.IndexUtils;
  // TMAPI
  import org.tmapi.core.TopicMapObject;
--- 20,23 ----
***************
*** 96,100 ****
          }
          return value;
- 
      }
  
--- 95,98 ----
***************
*** 106,118 ****
  
          String value = getValue(object);
- 
-         //        String value = null;
-         //        if (object instanceof DataObject) {
-         //            DataObject d = (DataObject)object;
-         //            value = d.getValue();
-         //            if (value == null) value = d.getResource().getReference();
-         //        } else if (object instanceof TopicName) {
-         //            value = ((TopicName)object).getValue();
-         //        }
          if (value != null) {
              addResultsRow(ret, new Object[] {object, value});
--- 104,107 ----
***************
*** 126,138 ****
      private void matchObject(String data, VariableSet ret) throws TologProcessingException
      {
!         IndexUtils.updateIndex(_occIdx);
          for (Iterator it = _occIdx.getOccurrencesByValue(data).iterator(); it.hasNext();) {
              addResultsRow(ret, new Object[] {it.next(), data});
          }
-         IndexUtils.updateIndex(_tnIdx);
          for (Iterator it = _tnIdx.getTopicNamesByValue(data).iterator(); it.hasNext();) {
              addResultsRow(ret, new Object[] { it.next(), data });
          }
-         IndexUtils.updateIndex(_varIdx);
          for (Iterator it = _varIdx.getVariantsByValue(data).iterator(); it.hasNext();) {
              addResultsRow(ret, new Object[] { it.next(), data });
--- 115,141 ----
      private void matchObject(String data, VariableSet ret) throws TologProcessingException
      {
!         try {
!             _occIdx.open();
!             if (!_occIdx.getFlags().isAutoUpdated()) {
!                 _occIdx.reindex();
!             }
!             _tnIdx.open();
!             if (!_tnIdx.getFlags().isAutoUpdated()) {
!                 _tnIdx.reindex();
!             }
!             _varIdx.open();
!             if (!_varIdx.getFlags().isAutoUpdated()) {
!                 _varIdx.reindex();
!             }
!         }
!         catch (TMAPIException ex) {
!             throw new TologParserException("Error initialising indexes for " + PREDICATE_NAME, ex);
!         }
          for (Iterator it = _occIdx.getOccurrencesByValue(data).iterator(); it.hasNext();) {
              addResultsRow(ret, new Object[] {it.next(), data});
          }
          for (Iterator it = _tnIdx.getTopicNamesByValue(data).iterator(); it.hasNext();) {
              addResultsRow(ret, new Object[] { it.next(), data });
          }
          for (Iterator it = _varIdx.getVariantsByValue(data).iterator(); it.hasNext();) {
              addResultsRow(ret, new Object[] { it.next(), data });
***************
*** 151,164 ****
              addResultsRow(ret, new Object[] { object, data });
          }
- 
-         //        if (object instanceof DataObject) {
-         //            if (data.equals(((DataObject)object).getValue())) {
-         //                addResultsRow(ret, new Object[] { object, data});
-         //            }
-         //        } else if (object instanceof TopicName) {
-         //            if (data.equals(((TopicName)object).getValue())) {
-         //                addResultsRow(ret, new Object[] { object, data });
-         //            }
-         //        }
      }
  
--- 154,157 ----
***************
*** 213,223 ****
          }
  
!         private void addVariants(VariantContainer vc) throws TologProcessingException {
!             for (Iterator it = vc.getVariants().iterator(); it.hasNext();) {
!                 Variant vn = (Variant) it.next();
!                 if (vn.getValue() != null) {
!                     addResultsRow(m_vs, new Object[] { vn, vn.getValue() });
                  }
-                 addVariants(v);
              }
          }
--- 206,216 ----
          }
  
!         private void addVariants(TopicName topicname) throws TologProcessingException {
!             for (Iterator it = topicname.getVariants().iterator(); it.hasNext();) {
!                 Variant variant = (Variant) it.next();
!                 String value = variant.getValue();
!                 if (value != null) {
!                     addResultsRow(m_vs, new Object[] { variant, value });
                  }
              }
          }
***************
*** 225,244 ****
  }
  
- 
- /*
-  * $Log$
-  * Revision 1.2  2005/03/07 12:32:00  lheuer
-  * More TM4J -> TMAPI translations
-  * Updated ToDo
-  * ResourcePredicate can handle Variants, too
-  *
-  * Revision 1.1  2005/03/06 17:30:00  lheuer
-  * Initial tolog import
-  *
-  * Revision 1.2  2004/09/27 14:34:00  kal_ahmed
-  * Predicate now checks the string value of variant names as well as occurrences and base names.
-  *
-  * Revision 1.1  2004/06/13 09:06:43  kal_ahmed
-  * Initial version of value() predicate.
-  *
-  */
\ No newline at end of file
--- 218,219 ----