Menu
▾
▴
tmapi-utils-commits — Notification of CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(85) |
Apr
|
May
|
Jun
|
Jul
(21) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Lars H. <lh...@us...> - 2005-03-07 14:00:35
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6672/src/org/tmapiutils/query/tolog/predicates/test Modified Files: AssociationPredicateTest.java Log Message: Added missing org.tmapi.core.TopicMap import Index: AssociationPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/AssociationPredicateTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AssociationPredicateTest.java 7 Mar 2005 13:37:56 -0000 1.4 --- AssociationPredicateTest.java 7 Mar 2005 14:00:25 -0000 1.5 *************** *** 19,22 **** --- 19,23 ---- import org.tmapiutils.query.tolog.utils.VariableSet; // TMAPI + import org.tmapi.core.TopicMap; import org.tmapi.core.Topic; import org.tmapi.core.Association; *************** *** 107,110 **** --- 108,114 ---- /* * $Log$ + * Revision 1.5 2005/03/07 14:00:25 lheuer + * Added missing org.tmapi.core.TopicMap import + * * Revision 1.4 2005/03/07 13:37:56 lheuer * Added missing org.tmapi.core.Topic import |
|
From: Lars H. <lh...@us...> - 2005-03-07 13:38:05
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv791/src/org/tmapiutils/query/tolog/predicates/test Modified Files: AssociationPredicateTest.java Log Message: Added missing org.tmapi.core.Topic import Index: AssociationPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/AssociationPredicateTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AssociationPredicateTest.java 7 Mar 2005 12:32:00 -0000 1.3 --- AssociationPredicateTest.java 7 Mar 2005 13:37:56 -0000 1.4 *************** *** 19,22 **** --- 19,23 ---- import org.tmapiutils.query.tolog.utils.VariableSet; // TMAPI + import org.tmapi.core.Topic; import org.tmapi.core.Association; import org.tmapi.index.core.TopicsIndex; *************** *** 106,109 **** --- 107,113 ---- /* * $Log$ + * Revision 1.4 2005/03/07 13:37:56 lheuer + * Added missing org.tmapi.core.Topic import + * * Revision 1.3 2005/03/07 12:32:00 lheuer * More TM4J -> TMAPI translations |
|
From: Lars H. <lh...@us...> - 2005-03-07 13:12:52
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27016/src/org/tmapiutils/query/tolog/predicates/test Modified Files: PredicateTestBase.java Log Message: Clear the _objectMap in tearDown() Index: PredicateTestBase.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/PredicateTestBase.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PredicateTestBase.java 7 Mar 2005 13:00:41 -0000 1.5 --- PredicateTestBase.java 7 Mar 2005 13:12:38 -0000 1.6 *************** *** 65,68 **** --- 65,69 ---- protected void tearDown() throws Exception{ super.tearDown(); + _objectMap.clear(); // remove created TopicMaps from TopicMapSystem removeAllMaps(); *************** *** 103,106 **** --- 104,110 ---- /* * $Log$ + * Revision 1.6 2005/03/07 13:12:38 lheuer + * Clear the _objectMap in tearDown() + * * Revision 1.5 2005/03/07 13:00:41 lheuer * Typo _system vs. _tmSystem |
|
From: Lars H. <lh...@us...> - 2005-03-07 13:05:52
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25500/src/org/tmapiutils/query/tolog Modified Files: todo-log.txt Log Message: AssociationRole.getParent() -> AssociationRole.getAssociation() Index: todo-log.txt =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/todo-log.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** todo-log.txt 7 Mar 2005 12:32:00 -0000 1.7 --- todo-log.txt 7 Mar 2005 13:05:42 -0000 1.8 *************** *** 83,93 **** - File: query\tolog\predicates\test\TypePredicateTest.java - line: 75 - getParent() - Cannot resolve getParent - line: 131 - getParent() - Cannot resolve getParent File: query\tolog\predicates\test\ValueLikePredicateTest.java --- 83,86 ---- |
|
From: Lars H. <lh...@us...> - 2005-03-07 13:05:52
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25500/src/org/tmapiutils/query/tolog/predicates/test Modified Files: TypePredicateTest.java Log Message: AssociationRole.getParent() -> AssociationRole.getAssociation() Index: TypePredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/TypePredicateTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TypePredicateTest.java 7 Mar 2005 12:32:00 -0000 1.3 --- TypePredicateTest.java 7 Mar 2005 13:05:41 -0000 1.4 *************** *** 102,106 **** assertEquals(getObjectById("employee"), out.getRow(0).get(1)); ! params.set(0, fredRole.getParent()); out = m_predicate.matches(params, m_context); assertNotNull(out); --- 102,106 ---- assertEquals(getObjectById("employee"), out.getRow(0).get(1)); ! params.set(0, fredRole.getAssociation()); out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 158,162 **** assertEquals(1, out.getRows().size()); ! params.set(0, fredRole.getParent()); params.set(1, getObjectById("works-for")); out = m_predicate.matches(params, m_context); --- 158,162 ---- assertEquals(1, out.getRows().size()); ! params.set(0, fredRole.getAssociation()); params.set(1, getObjectById("works-for")); out = m_predicate.matches(params, m_context); *************** *** 193,196 **** --- 193,199 ---- /* * $Log$ + * Revision 1.4 2005/03/07 13:05:41 lheuer + * AssociationRole.getParent() -> AssociationRole.getAssociation() + * * Revision 1.3 2005/03/07 12:32:00 lheuer * More TM4J -> TMAPI translations |
|
From: Lars H. <lh...@us...> - 2005-03-07 13:00:57
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24279/src/org/tmapiutils/query/tolog/predicates/test Modified Files: PredicateTestBase.java Log Message: Typo _system vs. _tmSystem Index: PredicateTestBase.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/PredicateTestBase.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PredicateTestBase.java 7 Mar 2005 12:32:00 -0000 1.4 --- PredicateTestBase.java 7 Mar 2005 13:00:41 -0000 1.5 *************** *** 37,41 **** private HashMap _maps; private HashMap _objectMap; ! protected static TopicMapSystem _system; protected TologContext m_context; --- 37,41 ---- private HashMap _maps; private HashMap _objectMap; ! protected static TopicMapSystem _tmSystem; protected TologContext m_context; *************** *** 103,106 **** --- 103,109 ---- /* * $Log$ + * Revision 1.5 2005/03/07 13:00:41 lheuer + * Typo _system vs. _tmSystem + * * Revision 1.4 2005/03/07 12:32:00 lheuer * More TM4J -> TMAPI translations |
|
From: Lars H. <lh...@us...> - 2005-03-07 12:32:12
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16920/src/org/tmapiutils/query/tolog/predicates/test Modified Files: AssociationPredicateTest.java AssociationRolePredicateTest.java BaseLocatorPredicateTest.java DirectInstanceOfPredicateTest.java InstanceOfPredicateTest.java PredicateTestBase.java ReifiesPredicateTest.java ResourcePredicateTest.java TopicMapPredicateTest.java TypePredicateTest.java Log Message: More TM4J -> TMAPI translations Updated ToDo ResourcePredicate can handle Variants, too Index: ResourcePredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/ResourcePredicateTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ResourcePredicateTest.java 6 Mar 2005 19:37:40 -0000 1.3 --- ResourcePredicateTest.java 7 Mar 2005 12:32:00 -0000 1.4 *************** *** 8,12 **** *$Header$ */ ! package org.tmapiutils.query.tolog.predicates.test; --- 8,12 ---- *$Header$ */ ! package org.tmapiutils.query.tolog.predicates.test; *************** *** 20,28 **** // TMAPI import org.tmapi.core.Locator; import org.tmapi.core.Topic; import org.tmapi.core.Occurrence; /** ! * * @author Kal Ahmed (ka...@te...) */ --- 20,30 ---- // TMAPI import org.tmapi.core.Locator; + import org.tmapi.core.TopicMap; import org.tmapi.core.Topic; import org.tmapi.core.Occurrence; + import org.tmapi.index.core.TopicsIndex; /** ! * * @author Kal Ahmed (ka...@te...) */ *************** *** 36,40 **** } ! private static final String TESTMAP = "[techquila]\n" + "{techquila, homepage, \"http://www.techquila.com/\"}\n" + --- 38,42 ---- } ! private static final String TESTMAP = "[techquila]\n" + "{techquila, homepage, \"http://www.techquila.com/\"}\n" + *************** *** 50,53 **** --- 52,67 ---- } + + public void createTestMap(TopicMap tm) { + Topic tmapiutils = tm.createTopic(); + tmapiutils.addSubjectIdentifier(createLocator("tmapiutils")); + Topic homepage = tm.createTopic(); + tmapiutils.createOccurrence(createLocator("http://tmapiutils.org/", homepage, null); + Topic tmapi = tm.createTopic(); + tmapiutils.addSubjectIdentifier(createLocator("tmapi")); + tmapi.createOccurrence(createLocator("http://tmapi.org/", homepage, null); + } + + /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.test.PredicateTestBase#getPredicateClass() *************** *** 62,65 **** --- 76,84 ---- public void testOpenMatch() throws Exception { + TopicsIndex topicsIdx = m_tm.getHelperObjects(TopicsIndex.class); + topicsIdx.open(); + topicsIdx.reindex(); + Topic tmapiutils = topicsIdx.getTopicBySubjectIdentifier(createLocator("tmapiutils")); + Topic tmapi = topicsIdx.getTopicBySubjectIdentifier(createLocator("tmapi")); List params = new ArrayList(); Variable a = new Variable("A"); *************** *** 72,76 **** assertEquals(2, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! Iterator it = ((Topic) m_tm.getObjectById("techquila")).getOccurrences().iterator(); while (it.hasNext()) { Occurrence o = (Occurrence)it.next(); --- 91,95 ---- assertEquals(2, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! Iterator it = tmapiutils.getOccurrences().iterator(); while (it.hasNext()) { Occurrence o = (Occurrence)it.next(); *************** *** 80,84 **** assertTrue(l.equals(o.getResource())); } ! it = ((Topic) m_tm.getObjectById("tm4j")).getOccurrences().iterator(); while (it.hasNext()) { Occurrence o = (Occurrence)it.next(); --- 99,103 ---- assertTrue(l.equals(o.getResource())); } ! it = tmapi.getOccurrences().iterator(); while (it.hasNext()) { Occurrence o = (Occurrence)it.next(); *************** *** 91,99 **** public void testOccurrenceByLocator() throws Exception { List params = new ArrayList(); Variable a = new Variable("A"); ! Locator l = m_tm.getLocatorFactory().createLocator("URI", "http://www.techquila.com/"); params.add(a); ! params.add(l); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); --- 110,122 ---- public void testOccurrenceByLocator() throws Exception { + TopicsIndex topicsIdx = m_tm.getHelperObjects(TopicsIndex.class); + topicsIdx.open(); + topicsIdx.reindex(); + Topic tmapiutils = topicsIdx.getTopicBySubjectIdentifier(createLocator("tmapiutils")); List params = new ArrayList(); Variable a = new Variable("A"); ! Locator loc = m_tm.createLocator("http://tmapiutils.org/"); params.add(a); ! params.add(loc); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); *************** *** 101,108 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! Iterator it = ((Topic) m_tm.getObjectById("techquila")).getOccurrences().iterator(); while (it.hasNext()) { Occurrence o = (Occurrence)it.next(); ! if (o.getResource().equals(l)) { assertTrue(out.getColumn(a).contains(o)); } else { --- 124,131 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! Iterator it = tmapiutils.getOccurrences().iterator(); while (it.hasNext()) { Occurrence o = (Occurrence)it.next(); ! if (o.getResource().equals(loc)) { assertTrue(out.getColumn(a).contains(o)); } else { *************** *** 111,126 **** } } ! public void testLocatorByOccurrence() throws Exception { List params = new ArrayList(); Variable b = new Variable("B"); ! Locator l = m_tm.getLocatorFactory().createLocator("URI", "http://www.techquila.com/"); Occurrence o = null; ! Iterator it = ((Topic) m_tm.getObjectById("techquila")).getOccurrences().iterator(); while (it.hasNext()) { o = (Occurrence)it.next(); ! if (o.getResource().equals(l)) { break; ! } } assertNotNull("INTERNAL ERROR: Did not find occurrence to use in the query test.", o); --- 134,153 ---- } } ! public void testLocatorByOccurrence() throws Exception { + TopicsIndex topicsIdx = m_tm.getHelperObjects(TopicsIndex.class); + topicsIdx.open(); + topicsIdx.reindex(); + Topic tmapiutils = topicsIdx.getTopicBySubjectIdentifier(createLocator("tmapiutils")); List params = new ArrayList(); Variable b = new Variable("B"); ! Locator loc = m_tm.createLocator("http://tmapiutils.org/"); Occurrence o = null; ! Iterator it = tmapiutils.getOccurrences().iterator(); while (it.hasNext()) { o = (Occurrence)it.next(); ! if (o.getResource().equals(loc)) { break; ! } } assertNotNull("INTERNAL ERROR: Did not find occurrence to use in the query test.", o); *************** *** 132,139 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getColumn(b).contains(l)); } ! // TODO: Implement tests for closed matches. } --- 159,167 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getColumn(b).contains(loc)); } ! // TODO: Implement tests for closed matches. + // Variant Tests! } *************** *** 141,144 **** --- 169,177 ---- /* * $Log$ + * Revision 1.4 2005/03/07 12:32:00 lheuer + * More TM4J -> TMAPI translations + * Updated ToDo + * ResourcePredicate can handle Variants, too + * * Revision 1.3 2005/03/06 19:37:40 lheuer * Changed getTopicByID to getObjectById Index: PredicateTestBase.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/PredicateTestBase.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PredicateTestBase.java 6 Mar 2005 19:37:40 -0000 1.3 --- PredicateTestBase.java 7 Mar 2005 12:32:00 -0000 1.4 *************** *** 10,66 **** package org.tmapiutils.query.tolog.predicates.test; ! import java.io.StringReader; import junit.framework.TestCase; - import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.parser.Predicate; import org.tmapiutils.query.tolog.utils.TologContext; import org.tmapi.core.TopicMap; - import org.tmapi.core.TopicMapProvider; - import org.tmapi.core.TopicMapProviderFactory; - import org.tmapi.core.memory.TopicMapProviderFactoryImpl; - import org.tmapi.core.source.SerializedTopicMapSource; - import org.tmapi.core.utils.LTMBuilder; - import org.tmapi.core.utils.TopicMapBuilder; /** * @author Kal ! * * Describe PredicateTestBase here. */ public abstract class PredicateTestBase extends TestCase { protected Predicate m_predicate; ! protected TopicMap m_tm; ! protected TopicMapProvider m_provider; protected TologContext m_context; ! ! public abstract String getTestMap(); public abstract Class getPredicateClass(); ! public PredicateTestBase(String name) { super(name); } ! ! public TopicMapBuilder getBuilder() { ! return new LTMBuilder(); ! } ! public void setUp() throws Exception { ! TopicMapProviderFactory tmpf = new TopicMapProviderFactoryImpl(); ! m_provider = tmpf.newTopicMapProvider(); ! Locator loc = m_provider.getLocatorFactory().createLocator("URI", "http://www.techquila.com/test/tolog1.0.xtm"); ! SerializedTopicMapSource src = new SerializedTopicMapSource(new StringReader(getTestMap()), loc, getBuilder()); ! m_tm = m_provider.addTopicMap(src); ! m_predicate = (Predicate) getPredicateClass().newInstance(); ! m_predicate.initialise(m_tm); ! m_context = new TologContext(); } } /* * $Log$ * Revision 1.3 2005/03/06 19:37:40 lheuer * Changed getTopicByID to getObjectById --- 10,111 ---- package org.tmapiutils.query.tolog.predicates.test; ! import java.util.HashMap; ! ! //import java.io.StringReader; import junit.framework.TestCase; import org.tmapiutils.query.tolog.parser.Predicate; import org.tmapiutils.query.tolog.utils.TologContext; + // TMAPI + import org.tmapi.core.Locator; + import org.tmapi.core.TopicMapSystemFactory; + import org.tmapi.core.TopicMapSystem; + import org.tmapi.core.TopicMapObject; import org.tmapi.core.TopicMap; /** * @author Kal ! * * Describe PredicateTestBase here. */ public abstract class PredicateTestBase extends TestCase { + protected Predicate m_predicate; ! protected TopicMap _topicMap; ! private HashMap _maps; ! private HashMap _objectMap; ! protected static TopicMapSystem _system; protected TologContext m_context; ! ! /** ! * Creates a topic map to work with. ! */ ! public abstract void createTestMap(TopicMap tm); public abstract Class getPredicateClass(); ! public PredicateTestBase(String name) { super(name); + _maps = new HashMap(); + _objectMap = new HashMap(); } ! public void setUp() throws Exception { ! super().setUp(); ! _tmSystem = TopicMapSystemFactory().newInstance().newTopicMapSystem(); ! removeAllMaps(); ! m_tm = createTopicMap('http://tmapiutils.org/test/tolog1.0/'); ! m_predicate = (Predicate) getPredicateClass().newInstance(); ! m_predicate.createTestMap(m_tm); ! m_predicate.initialise(m_tm); ! m_context = new TologContext(); } + protected void tearDown() throws Exception{ + super.tearDown(); + // remove created TopicMaps from TopicMapSystem + removeAllMaps(); + // Close TopicMapSystem instance + _tmSystem.close(); + } + + protected void registerObject(String name, TopicMapObject obj) { + _objectMap.put(name, obj); + } + + protected TopicMapObject getObjectById(String name) { + return (TopicMapObject) _objectMap.get(name); + } + + protected Locator createLocator(String reference) { + return m_tm.createLocator(reference); + } + + protected void removeAllMaps() throws TMAPIException { + for (Iterator iter = _tmSystem.getBaseLocators().iterator(); iter.hasNext();) + removeTopicMap(_tmSystem.getTopicMap((Locator)iter.next())); + } + } + + protected TopicMap createTopicMap(String reference)throws TopicMapExistsException{ + TopicMap tm = _tmSystem.createTopicMap(reference); + _maps.put(reference,tm); + return tm; + } + protected void removeTopicMap(TopicMap tm)throws TMAPIException{ + _maps.remove(tm.getBaseLocator().getReference()); + tm.remove(); + } + } /* * $Log$ + * Revision 1.4 2005/03/07 12:32:00 lheuer + * More TM4J -> TMAPI translations + * Updated ToDo + * ResourcePredicate can handle Variants, too + * * Revision 1.3 2005/03/06 19:37:40 lheuer * Changed getTopicByID to getObjectById Index: TopicMapPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/TopicMapPredicateTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TopicMapPredicateTest.java 6 Mar 2005 19:37:40 -0000 1.2 --- TopicMapPredicateTest.java 7 Mar 2005 12:32:00 -0000 1.3 *************** *** 16,19 **** --- 16,23 ---- import org.tmapiutils.query.tolog.predicates.TopicMapPredicate; import org.tmapiutils.query.tolog.utils.VariableSet; + // TMAPI + import org.tmapi.core.TopicMapObject; + import org.tmapi.core.Topic; + import org.tmapi.index.core.TopicMapObjectsIndex; /** *************** *** 37,40 **** --- 41,49 ---- } + public void createTestMap(TopicMap tm) { + Topic topic = tm.createTopic(); + topic.addSourceLocator(createLocator("hello-world")); + } + /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.test.PredicateTestBase#getPredicateClass() *************** *** 55,58 **** --- 64,70 ---- public void testClosedMatch() throws Exception { + tmoIdx = (TopicMapObjectsIndex) m_tm.getHelperObject(TopicMapObjectsIndex.class); + tmoIdx.open(); + tmoIdx.reindex(); ArrayList params = new ArrayList(); params.add(new Variable("A")); *************** *** 64,68 **** assertEquals(m_tm, out.getRow(0).get(0)); ! params.set(0, m_tm.getObjectById("hello-world")); out = m_predicate.matches(params, m_context); assertNotNull(out); --- 76,81 ---- assertEquals(m_tm, out.getRow(0).get(0)); ! TopicMapObject tmo = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("hello-world")); ! params.set(0, tmo); out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 74,77 **** --- 87,95 ---- /* * $Log$ + * Revision 1.3 2005/03/07 12:32:00 lheuer + * More TM4J -> TMAPI translations + * Updated ToDo + * ResourcePredicate can handle Variants, too + * * Revision 1.2 2005/03/06 19:37:40 lheuer * Changed getTopicByID to getObjectById Index: ReifiesPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/ReifiesPredicateTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ReifiesPredicateTest.java 6 Mar 2005 21:11:33 -0000 1.2 --- ReifiesPredicateTest.java 7 Mar 2005 12:32:00 -0000 1.3 *************** *** 15,20 **** import org.tmapiutils.query.tolog.predicates.ReifiesPredicate; import org.tmapiutils.query.tolog.utils.VariableSet; ! import org.tmapi.core.utils.TopicMapBuilder; ! import org.tmapi.core.utils.XTMBuilder; /** --- 15,21 ---- import org.tmapiutils.query.tolog.predicates.ReifiesPredicate; import org.tmapiutils.query.tolog.utils.VariableSet; ! // import org.tmapi.core.utils.TopicMapBuilder; ! // import org.tmapi.core.utils.XTMBuilder; ! import org.tmapi.index.core.TopicMapObjectsIndex; /** *************** *** 40,46 **** } ! public TopicMapBuilder getBuilder() { ! return new XTMBuilder(); ! } /* (non-Javadoc) --- 41,65 ---- } ! // public TopicMapBuilder getBuilder() { ! // return new XTMBuilder(); ! // } ! ! public void createTestMap(TopicMap tm) { ! Topic works_for = tm.createTopic(); ! Topic fred = tm.createTopic(); ! Topic fredemp = tm.createTopic(); ! fred.addSubjectIdentifier(tm.createLocator("fred")); ! Topic barney = tm.createTopic(); ! barney.addSubjectIdentifier(tm.createLocator("barney")); ! Topic employee = tm.createTopic(); ! Topic employer = tm.createTopic(); ! Topic bigco = tm.createTopic(); ! Association assoc = tm.createAssociation(); ! assoc.setType(works_for); ! assoc.createAssociationRole(fred, employee); ! assoc.createAssociationRole(bigco, employer); ! assoc.createAssociationRole(barney, employee); ! } ! /* (non-Javadoc) *************** *** 52,55 **** --- 71,77 ---- public void testMatchReifier() throws Exception { + tmoIdx = (TopicMapObjectsIndex) m_tm.getHelperObject(TopicMapObjectsIndex.class); + tmoIdx.open(); + tmoIdx.reindex(); ArrayList params = new ArrayList(); Variable a = new Variable("A"); *************** *** 61,68 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).contains(m_tm.getObjectById("fredemp"))); } public void testMatchReified() throws Exception { ArrayList params = new ArrayList(); Variable a = new Variable("A"); --- 83,94 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! TopicMapObject tmo = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("fredemp")); ! assertTrue(out.getRow(0).contains(tmo)); } public void testMatchReified() throws Exception { + tmoIdx = (TopicMapObjectsIndex) m_tm.getHelperObject(TopicMapObjectsIndex.class); + tmoIdx.open(); + tmoIdx.reindex(); ArrayList params = new ArrayList(); Variable a = new Variable("A"); *************** *** 74,81 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).contains(m_tm.getObjectById("assoc1"))); } public void testOpenMatch() throws Exception { ArrayList params = new ArrayList(); Variable a = new Variable("A"); --- 100,111 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! TopicMapObject tmo = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("assoc1")); ! assertTrue(out.getRow(0).contains(tmo)); } public void testOpenMatch() throws Exception { + tmoIdx = (TopicMapObjectsIndex) m_tm.getHelperObject(TopicMapObjectsIndex.class); + tmoIdx.open(); + tmoIdx.reindex(); ArrayList params = new ArrayList(); Variable a = new Variable("A"); *************** *** 88,96 **** assertEquals(2, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).get(0).equals(m_tm.getObjectById("fredemp"))); ! assertTrue(out.getRow(0).get(1).equals(m_tm.getObjectById("assoc1"))); } public void testClosedMatch() throws Exception { ArrayList params = new ArrayList(); Variable a = new Variable("A"); --- 118,131 ---- assertEquals(2, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! TopicMapObject fredemp = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("fredemp")); ! TopicMapObject assoc1 = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("assoc1")); ! assertTrue(out.getRow(0).get(0).equals(fredemp)); ! assertTrue(out.getRow(0).get(1).equals(assoc1)); } public void testClosedMatch() throws Exception { + tmoIdx = (TopicMapObjectsIndex) m_tm.getHelperObject(TopicMapObjectsIndex.class); + tmoIdx.open(); + tmoIdx.reindex(); ArrayList params = new ArrayList(); Variable a = new Variable("A"); *************** *** 99,111 **** params.add(b); m_predicate.setParameters(params); ! params.set(0, m_tm.getObjectById("fredemp")); ! params.set(1, m_tm.getObjectById("assoc1")); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(2, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! ! params.set(0, m_tm.getObjectById("fredemp")); ! params.set(1, m_tm.getObjectById("m1")); out = m_predicate.matches(params, m_context); assertNotNull(out); --- 134,148 ---- params.add(b); m_predicate.setParameters(params); ! TopicMapObject fredemp = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("fredemp")); ! TopicMapObject assoc1 = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("assoc1")); ! params.set(0, fredemp)); ! params.set(1, assoc1)); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(2, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! TopicMapObject m1 = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("m1")); ! params.set(0, fredemp)); ! params.set(1, m1)); out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 117,120 **** --- 154,162 ---- /* * $Log$ + * Revision 1.3 2005/03/07 12:32:00 lheuer + * More TM4J -> TMAPI translations + * Updated ToDo + * ResourcePredicate can handle Variants, too + * * Revision 1.2 2005/03/06 21:11:33 lheuer * More TM4J -> TMAPI translations Index: AssociationRolePredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/AssociationRolePredicateTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AssociationRolePredicateTest.java 6 Mar 2005 19:37:23 -0000 1.2 --- AssociationRolePredicateTest.java 7 Mar 2005 12:32:00 -0000 1.3 *************** *** 19,33 **** import org.tmapiutils.query.tolog.predicates.AssociationRolePredicate; import org.tmapiutils.query.tolog.utils.VariableSet; import org.tmapi.core.Association; import org.tmapi.core.AssociationRole; ! import org.tmapi.core.Topic; /** * @author Kal ! * * Describe AssociationRolePredicateTest here. */ public class AssociationRolePredicateTest extends PredicateTestBase { /** * @param name --- 19,37 ---- import org.tmapiutils.query.tolog.predicates.AssociationRolePredicate; import org.tmapiutils.query.tolog.utils.VariableSet; + // TMAPI + import org.tmapi.core.Topic; + import org.tmapi.core.TopicMap; import org.tmapi.core.Association; import org.tmapi.core.AssociationRole; ! import org.tmapi.index.core.TopicsIndex; /** * @author Kal ! * * Describe AssociationRolePredicateTest here. */ public class AssociationRolePredicateTest extends PredicateTestBase { + /** * @param name *************** *** 45,48 **** --- 49,69 ---- } + + public void createTestMap(TopicMap tm) { + Topic works_for = tm.createTopic(); + Topic fred = tm.createTopic(); + fred.addSubjectIdentifier(tm.createLocator("fred")); + Topic barney = tm.createTopic(); + barney.addSubjectIdentifier(tm.createLocator("barney")); + Topic employee = tm.createTopic(); + Topic employer = tm.createTopic(); + Topic bigco = tm.createTopic(); + Association assoc = tm.createAssociation(); + assoc.setType(works_for); + assoc.createAssociationRole(fred, employee); + assoc.createAssociationRole(bigco, employer); + assoc.createAssociationRole(barney, employee); + } + /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.test.PredicateTestBase#getPredicateClass() *************** *** 53,61 **** public void testMatchAssociation() throws Exception { ArrayList params = new ArrayList(); Variable a = new Variable("A"); ! AssociationRole m = (AssociationRole) ((Topic) m_tm.getObjectById("fred")).getRolesPlayed().iterator().next(); params.add(a); ! params.add(m); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); --- 74,86 ---- public void testMatchAssociation() throws Exception { + TopicsIndex topicsIdx = m_tm.getHelperObjects(TopicsIndex.class); + topicsIdx.open(); + topicsIdx.reindex(); ArrayList params = new ArrayList(); Variable a = new Variable("A"); ! Topic fred = topicsIdx.getTopicBySubjectIdentifier(createLocator("fred")); ! AssociationRole role = (AssociationRole) fred.getRolesPlayed().iterator().next(); params.add(a); ! params.add(role); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); *************** *** 63,72 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertEquals(m.getParent(), out.getRow(0).get(0)); } ! public void testMatchRoles() throws Exception { ArrayList params = new ArrayList(); ! Association assoc = ((AssociationRole) ((Topic) m_tm.getObjectById("barney")).getRolesPlayed().iterator().next()).getParent(); Variable a = new Variable("A"); params.add(assoc); --- 88,101 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertEquals(role.getAssociation(), out.getRow(0).get(0)); } ! public void testMatchRoles() throws Exception { + TopicsIndex topicsIdx = m_tm.getHelperObjects(TopicsIndex.class); + topicsIdx.open(); + topicsIdx.reindex(); ArrayList params = new ArrayList(); ! Topic barney = topicsIdx.getTopicBySubjectIdentifier(createLocator("fred")); ! Association assoc = ((AssociationRole) barney.getRolesPlayed().iterator().next()).getAssociation(); Variable a = new Variable("A"); params.add(assoc); *************** *** 80,84 **** assertEquals(assoc, ((AssociationRole)out.getRow(1).get(0)).getParent()); } ! public void testOpenMatch() throws Exception { ArrayList params = new ArrayList(); --- 109,113 ---- assertEquals(assoc, ((AssociationRole)out.getRow(1).get(0)).getParent()); } ! public void testOpenMatch() throws Exception { ArrayList params = new ArrayList(); *************** *** 92,103 **** assertEquals(2, out.getColumns().size()); assertEquals(4, out.getRows().size()); ! Iterator it = out.getRows().iterator(); while (it.hasNext()) { List row = (List)it.next(); ! assertEquals(row.get(0), ((AssociationRole)row.get(1)).getParent()); } } ! public void testClosedMatch() throws Exception { ArrayList params = new ArrayList(); Variable a = new Variable("A"); --- 121,135 ---- assertEquals(2, out.getColumns().size()); assertEquals(4, out.getRows().size()); ! Iterator it = out.getRows().iterator(); while (it.hasNext()) { List row = (List)it.next(); ! assertEquals(row.get(0), ((AssociationRole)row.get(1)).getAssociation()); } } ! public void testClosedMatch() throws Exception { + TopicsIndex topicsIdx = m_tm.getHelperObjects(TopicsIndex.class); + topicsIdx.open(); + topicsIdx.reindex(); ArrayList params = new ArrayList(); Variable a = new Variable("A"); *************** *** 106,130 **** params.add(b); m_predicate.setParameters(params); ! Topic fred = (Topic) m_tm.getObjectById("fred"); ! AssociationRole m = (AssociationRole) fred.getRolesPlayed().iterator().next(); ! Association assoc = m.getParent(); params.set(0, assoc); ! params.set(1, m); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(2, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! ! Topic barney = (Topic) m_tm.getObjectById("barney"); ! AssociationRole m2 = (AssociationRole)barney.getRolesPlayed().iterator().next(); ! params.set(1, m2); out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(2, out.getColumns().size()); ! assertEquals(0, out.getRows().size()); } } /* * $Log$ * Revision 1.2 2005/03/06 19:37:23 lheuer * Changed getTopicByID to getObjectById --- 138,167 ---- params.add(b); m_predicate.setParameters(params); ! Topic fred = topicsIdx.getTopicBySubjectIdentifier(createLocator("fred")); ! AssociationRole role = (AssociationRole) fred.getRolesPlayed().iterator().next(); ! Association assoc = role.getAssociation(); params.set(0, assoc); ! params.set(1, role); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(2, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! ! Topic barney = topicsIdx.getTopicBySubjectIdentifier(createLocator("barney")); ! AssociationRole role2 = (AssociationRole)barney.getRolesPlayed().iterator().next(); ! params.set(1, role2); out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(2, out.getColumns().size()); ! assertEquals(0, out.getRows().size()); } } /* * $Log$ + * Revision 1.3 2005/03/07 12:32:00 lheuer + * More TM4J -> TMAPI translations + * Updated ToDo + * ResourcePredicate can handle Variants, too + * * Revision 1.2 2005/03/06 19:37:23 lheuer * Changed getTopicByID to getObjectById Index: DirectInstanceOfPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/DirectInstanceOfPredicateTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DirectInstanceOfPredicateTest.java 6 Mar 2005 21:11:33 -0000 1.4 --- DirectInstanceOfPredicateTest.java 7 Mar 2005 12:32:00 -0000 1.5 *************** *** 9,13 **** import java.util.List; - import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.parser.Predicate; import org.tmapiutils.query.tolog.parser.Variable; --- 9,12 ---- *************** *** 15,24 **** import org.tmapiutils.query.tolog.utils.TologContext; import org.tmapiutils.query.tolog.utils.VariableSet; import org.tmapi.core.TopicMap; - import org.tmapi.core.TopicMapProvider; - import org.tmapi.core.TopicMapProviderFactory; - import org.tmapi.core.memory.TopicMapProviderFactoryImpl; - import org.tmapi.core.source.SerializedTopicMapSource; - import org.tmapi.core.utils.LTMBuilder; import junit.framework.TestCase; --- 14,26 ---- import org.tmapiutils.query.tolog.utils.TologContext; import org.tmapiutils.query.tolog.utils.VariableSet; + //import org.tmapi.core.TopicMapProvider; + //import org.tmapi.core.TopicMapProviderFactory; + //import org.tmapi.core.memory.TopicMapProviderFactoryImpl; + //import org.tmapi.core.source.SerializedTopicMapSource; + //import org.tmapi.core.utils.LTMBuilder; + + // TMAPI + import org.tmapi.core.Locator; import org.tmapi.core.TopicMap; import junit.framework.TestCase; *************** *** 26,30 **** /** * @author Kal ! * * Describe DirectInstanceOfPredicateTest here. */ --- 28,32 ---- /** * @author Kal ! * * Describe DirectInstanceOfPredicateTest here. */ *************** *** 35,39 **** private TopicMapProvider m_provider; private TologContext m_context; ! /** * Constructor for DirectInstanceOfPredicateTest. --- 37,41 ---- private TopicMapProvider m_provider; private TologContext m_context; ! /** * Constructor for DirectInstanceOfPredicateTest. *************** *** 67,71 **** assertTrue(out.getColumn(b).contains(m_tm.getObjectById("cake"))); } ! public void testClassMatch() throws Exception { --- 69,73 ---- assertTrue(out.getColumn(b).contains(m_tm.getObjectById("cake"))); } ! public void testClassMatch() throws Exception { *************** *** 82,86 **** assertTrue(out.getColumn(a).contains(m_tm.getObjectById("jaffacake"))); } ! public void testInstanceMatch() throws Exception { List params = new ArrayList(); --- 84,88 ---- assertTrue(out.getColumn(a).contains(m_tm.getObjectById("jaffacake"))); } ! public void testInstanceMatch() throws Exception { List params = new ArrayList(); *************** *** 94,100 **** assertEquals(2, out.getRows().size()); assertTrue(out.getColumn(a).contains(m_tm.getObjectById("cake"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("biscuit"))); } ! public void testClosedMatch() throws Exception { List params = new ArrayList(); --- 96,102 ---- assertEquals(2, out.getRows().size()); assertTrue(out.getColumn(a).contains(m_tm.getObjectById("cake"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("biscuit"))); } ! public void testClosedMatch() throws Exception { List params = new ArrayList(); *************** *** 110,114 **** assertTrue(out.getColumn(a).contains(m_tm.getObjectById("jaffacake"))); } ! protected void setUp() throws Exception { TopicMapProviderFactory tmpf = new TopicMapProviderFactoryImpl(); --- 112,116 ---- assertTrue(out.getColumn(a).contains(m_tm.getObjectById("jaffacake"))); } ! protected void setUp() throws Exception { TopicMapProviderFactory tmpf = new TopicMapProviderFactoryImpl(); Index: BaseLocatorPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/BaseLocatorPredicateTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BaseLocatorPredicateTest.java 6 Mar 2005 17:33:23 -0000 1.1 --- BaseLocatorPredicateTest.java 7 Mar 2005 12:32:00 -0000 1.2 *************** *** 31,34 **** --- 31,38 ---- return "[test]"; } + + public void createTestMap(TopicMap tm) { + // noop. + } /* (non-Javadoc) Index: TypePredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/TypePredicateTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TypePredicateTest.java 6 Mar 2005 19:37:40 -0000 1.2 --- TypePredicateTest.java 7 Mar 2005 12:32:00 -0000 1.3 *************** *** 8,12 **** *$Header$ */ ! package org.tmapiutils.query.tolog.predicates.test; --- 8,12 ---- *$Header$ */ ! package org.tmapiutils.query.tolog.predicates.test; *************** *** 24,28 **** /** ! * * @author Kal Ahmed (ka...@te...) */ --- 24,28 ---- /** ! * * @author Kal Ahmed (ka...@te...) */ *************** *** 43,46 **** --- 43,75 ---- } + public void createTestMap(TopicMap tm) { + Topic works_for = tm.createTopic(); + Topic fred = tm.createTopic(); + Topic person = tm.createTopic(); + Topic bootsize = tm.createTopic(); + fred.addType(person); + fred.createOccurrence("12", bootsize, null); + + Topic bigco = tm.createTopic(); + Topic company = tm.createTopic(); + bigco.addType(company); + + Topic employee = tm.createTopic(); + Topic employer = tm.createTopic(); + + Association assoc = tm.createAssociation(); + assoc.setType(works_for); + assoc.createAssociationRole(fred, employee); + assoc.createAssociationRole(bigco, employer); + + registerObject("works-for", works_for); + registerObject("fred", fred); + registerObject("employee", employee); + registerObject("employer", employer); + registerObject("bigco", bigco); + registerObject("person", person); + registerObject("bootsize", bootsize); + } + /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.test.PredicateTestBase#getPredicateClass() *************** *** 58,81 **** m_predicate.setParameters(params); ! Topic fred = (Topic) m_tm.getObjectById("fred"); ! params.set(0, fred.getOccurrences().iterator().next()); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(1, out.getRows().size()); ! assertEquals(m_tm.getObjectById("bootsize"), out.getRow(0).get(1)); ! AssociationRole fredRole = (AssociationRole) fred.getRolesPlayed().iterator().next(); params.set(0, fredRole); out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(1, out.getRows().size()); ! assertEquals(m_tm.getObjectById("employee"), out.getRow(0).get(1)); ! params.set(0, fredRole.getParent()); out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(1, out.getRows().size()); ! assertEquals(m_tm.getObjectById("works-for"), out.getRow(0).get(1)); } --- 87,110 ---- m_predicate.setParameters(params); ! Topic fred = (Topic) getObjectById("fred"); ! params.set(0, fred.getOccurrences().iterator().next()); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(1, out.getRows().size()); ! assertEquals(getObjectById("bootsize"), out.getRow(0).get(1)); ! AssociationRole fredRole = (AssociationRole) fred.getRolesPlayed().iterator().next(); params.set(0, fredRole); out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(1, out.getRows().size()); ! assertEquals(getObjectById("employee"), out.getRow(0).get(1)); ! params.set(0, fredRole.getParent()); out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(1, out.getRows().size()); ! assertEquals(getObjectById("works-for"), out.getRow(0).get(1)); } *************** *** 88,92 **** m_predicate.setParameters(params); ! params.set(1, m_tm.getObjectById("bootsize")); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); --- 117,121 ---- m_predicate.setParameters(params); ! params.set(1, getObjectById("bootsize")); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 94,98 **** assertTrue(out.getRow(0).get(0) instanceof Occurrence); ! params.set(1, m_tm.getObjectById("employee")); out = m_predicate.matches(params, m_context); assertNotNull(out); --- 123,127 ---- assertTrue(out.getRow(0).get(0) instanceof Occurrence); ! params.set(1, getObjectById("employee")); out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 106,110 **** assertTrue(out.getRow(0).get(0) instanceof Association); } ! public void testClosedMatch() throws Exception { ArrayList params = new ArrayList(); --- 135,139 ---- assertTrue(out.getRow(0).get(0) instanceof Association); } ! public void testClosedMatch() throws Exception { ArrayList params = new ArrayList(); *************** *** 115,128 **** m_predicate.setParameters(params); ! Topic fred = (Topic) m_tm.getObjectById("fred"); params.set(0, fred.getOccurrences().iterator().next()); ! params.set(1, m_tm.getObjectById("bootsize")); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(1, out.getRows().size()); ! AssociationRole fredRole = (AssociationRole) fred.getRolesPlayed().iterator().next(); params.set(0, fredRole); ! params.set(1, m_tm.getObjectById("employee")); out = m_predicate.matches(params, m_context); assertNotNull(out); --- 144,157 ---- m_predicate.setParameters(params); ! Topic fred = (Topic) getObjectById("fred"); params.set(0, fred.getOccurrences().iterator().next()); ! params.set(1, getObjectById("bootsize")); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(1, out.getRows().size()); ! AssociationRole fredRole = (AssociationRole) fred.getRolesPlayed().iterator().next(); params.set(0, fredRole); ! params.set(1, getObjectById("employee")); out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 130,139 **** params.set(0, fredRole.getParent()); ! params.set(1, m_tm.getObjectById("works-for")); out = m_predicate.matches(params, m_context); assertNotNull(out); ! assertEquals(1, out.getRows().size()); } ! public void testOpenMatch() throws Exception { ArrayList params = new ArrayList(); --- 159,168 ---- params.set(0, fredRole.getParent()); ! params.set(1, getObjectById("works-for")); out = m_predicate.matches(params, m_context); assertNotNull(out); ! assertEquals(1, out.getRows().size()); } ! public void testOpenMatch() throws Exception { ArrayList params = new ArrayList(); *************** *** 164,167 **** --- 193,201 ---- /* * $Log$ + * Revision 1.3 2005/03/07 12:32:00 lheuer + * More TM4J -> TMAPI translations + * Updated ToDo + * ResourcePredicate can handle Variants, too + * * Revision 1.2 2005/03/06 19:37:40 lheuer * Changed getTopicByID to getObjectById Index: AssociationPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/AssociationPredicateTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AssociationPredicateTest.java 6 Mar 2005 19:37:23 -0000 1.2 --- AssociationPredicateTest.java 7 Mar 2005 12:32:00 -0000 1.3 *************** *** 18,23 **** import org.tmapiutils.query.tolog.predicates.AssociationPredicate; import org.tmapiutils.query.tolog.utils.VariableSet; import org.tmapi.core.Association; ! /** * @author Kal --- 18,24 ---- import org.tmapiutils.query.tolog.predicates.AssociationPredicate; import org.tmapiutils.query.tolog.utils.VariableSet; + // TMAPI import org.tmapi.core.Association; ! import org.tmapi.index.core.TopicsIndex; /** * @author Kal *************** *** 41,44 **** --- 42,61 ---- "works-for(barney:employee, bigco:employer)\n"; } + + public void createTestMap(TopicMap tm) { + Topic works_for = tm.createTopic(); + Topic fred = tm.createTopic(); + fred.addSubjectIdentifier(tm.createLocator("fred")); + Topic barney = tm.createTopic(); + barney.addSubjectIdentifier(tm.createLocator("barney")); + Topic employee = tm.createTopic(); + Topic employer = tm.createTopic(); + Topic bigco = tm.createTopic(); + Association assoc = tm.createAssociation(); + assoc.setType(works_for); + assoc.createAssociationRole(fred, employee); + assoc.createAssociationRole(bigco, employer); + assoc.createAssociationRole(barney, employee); + } /* (non-Javadoc) *************** *** 66,69 **** --- 83,89 ---- public void testClosedMatch() throws Exception { + TopicsIndex topicsIdx = m_tm.getHelperObjects(TopicsIndex.class); + topicsIdx.open(); + topicsIdx.reindex(); ArrayList params = new ArrayList(); Variable a = new Variable("A"); *************** *** 75,80 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! ! params.set(0, m_tm.getObjectById("fred")); out = m_predicate.matches(params, m_context); assertNotNull(out); --- 95,100 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! fred = topicsIdx.getTopicBySubjectIdentifier(createLocator("fred")); ! params.set(0, fred); out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 86,89 **** --- 106,114 ---- /* * $Log$ + * Revision 1.3 2005/03/07 12:32:00 lheuer + * More TM4J -> TMAPI translations + * Updated ToDo + * ResourcePredicate can handle Variants, too + * * Revision 1.2 2005/03/06 19:37:23 lheuer * Changed getTopicByID to getObjectById Index: InstanceOfPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/InstanceOfPredicateTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InstanceOfPredicateTest.java 6 Mar 2005 21:11:33 -0000 1.3 --- InstanceOfPredicateTest.java 7 Mar 2005 12:32:00 -0000 1.4 *************** *** 16,23 **** import org.tmapiutils.query.tolog.predicates.InstanceOfPredicate; import org.tmapiutils.query.tolog.utils.VariableSet; /** * @author Kal ! * * Describe InstanceOfPredicateTest here. */ --- 16,29 ---- import org.tmapiutils.query.tolog.predicates.InstanceOfPredicate; import org.tmapiutils.query.tolog.utils.VariableSet; + // TMAPI + import org.tmapi.core.TopicMapObject; + import org.tmapi.core.TopicMap; + import org.tmapi.core.Topic; + import org.tmapi.index.core.TopicMapObjectsIndex; + import org.tmapi.index.core.TopicsIndex; /** * @author Kal ! * * Describe InstanceOfPredicateTest here. */ *************** *** 44,47 **** --- 50,81 ---- } + public void createTestMap(TopicMap tm) { + Topic animal = tm.createTopic(); + animal.addSourceLocator(createLocator("animal")); + Topic mammal = tm.createTopic(); + mammal.addSourceLocator(createLocator("mammal")); + Topic reptile = tm.createTopic(); + reptile.addSourceLocator(createLocator("reptile")); + Topic elephant = tm.createTopic(); + elephant.addSourceLocator(createLocator("elephant")); + Topic nelly = tm.createTopic(); + nelly.addSourceLocator(createLocator("nelly")); + nelly.addType(elephant); + Topic supersub = tm.createTopic(); + supersub.addSubjectIdentifier(createLocator("http://www.topicmaps.org/xtm/1.0/core.xtm#superclass-subclass")); + sub = tm.createTopic(); + sub.addSubjectIdentifier(createLocator("http://www.topicmaps.org/xtm/1.0/core.xtm#subclass")); + supr = tm.createTopic(); + supr.addSubjectIdentifier(createLocator("http://www.topicmaps.org/xtm/1.0/core.xtm#superclass")); + + Association assoc = tm.createAssociation(); + assoc.setType(supersub); + assoc.createAssociationRole(animal, supr); + assoc.createAssociationRole(mammal, sub); + assoc.createAssociationRole(reptile, sub); + assoc.createAssociationRole(mammal, supr); + assoc.createAssociationRole(elephant, sub); + } + /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.test.PredicateTestBase#getPredicateClass() *************** *** 52,58 **** public void testClassMatch() throws Exception { ArrayList params = new ArrayList(); ! Variable a = new Variable("A"); ! params.add(m_tm.getObjectById("nelly")); params.add(a); m_predicate.setParameters(params); --- 86,99 ---- public void testClassMatch() throws Exception { + tmoIdx = (TopicMapObjectsIndex) m_tm.getHelperObject(TopicMapObjectsIndex.class); + tmoIdx.open(); + tmoIdx.reindex(); + TopicMapObject nelly = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("nelly")); + TopicMapObject elephant = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("elephant")); + TopicMapObject mammal = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("mammal")); + TopicMapObject animal = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("animal")); ArrayList params = new ArrayList(); ! Variable a = new Variable("A"); ! params.add(nelly); params.add(a); m_predicate.setParameters(params); *************** *** 61,74 **** assertEquals(1, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("elephant"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("mammal"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("animal"))); } ! public void testInstanceMatch() throws Exception { ArrayList params = new ArrayList(); Variable a = new Variable("A"); params.add(a); ! params.add(m_tm.getObjectById("animal")); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); --- 102,120 ---- assertEquals(1, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(elephant)); ! assertTrue(out.getColumn(a).contains(mammal)); ! assertTrue(out.getColumn(a).contains(animal)); } ! public void testInstanceMatch() throws Exception { + tmoIdx = (TopicMapObjectsIndex) m_tm.getHelperObject(TopicMapObjectsIndex.class); + tmoIdx.open(); + tmoIdx.reindex(); + TopicMapObject animal = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("animal")); + TopicMapObject nelly = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("nelly")); ArrayList params = new ArrayList(); Variable a = new Variable("A"); params.add(a); ! params.add(animal); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); *************** *** 76,83 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("nelly"))); } ! public void testOpenMatch() throws Exception { ArrayList params = new ArrayList(); Variable a = new Variable("A"); --- 122,136 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(nelly)); } ! public void testOpenMatch() throws Exception { + tmoIdx = (TopicMapObjectsIndex) m_tm.getHelperObject(TopicMapObjectsIndex.class); + tmoIdx.open(); + tmoIdx.reindex(); + TopicMapObject animal = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("animal")); + TopicMapObject nelly = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("nelly")); + TopicMapObject elephant = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("elephant")); + TopicMapObject mammal = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("mammal")); ArrayList params = new ArrayList(); Variable a = new Variable("A"); *************** *** 90,100 **** assertEquals(2, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("nelly"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectById("elephant"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectById("mammal"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectById("animal"))); } ! public void testClosedMatch() throws Exception { ArrayList params = new ArrayList(); Variable a = new Variable("A"); --- 143,160 ---- assertEquals(2, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(nelly)); ! assertTrue(out.getColumn(b).contains(elephant)); ! assertTrue(out.getColumn(b).contains(mammal)); ! assertTrue(out.getColumn(b).contains(animal)); } ! public void testClosedMatch() throws Exception { + tmoIdx = (TopicMapObjectsIndex) m_tm.getHelperObject(TopicMapObjectsIndex.class); + tmoIdx.open(); + tmoIdx.reindex(); + TopicMapObject animal = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("animal")); + TopicMapObject nelly = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("nelly")); + TopicMapObject reptile = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("reptile")); + TopicMapObject mammal = tmoIdx.getTopicMapObjectBySourceLocator(createLocator("mammal")); ArrayList params = new ArrayList(); Variable a = new Variable("A"); *************** *** 103,118 **** params.add(b); m_predicate.setParameters(params); ! params.set(0, m_tm.getObjectById("nelly")); ! params.set(1, m_tm.getObjectById("mammal")); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(1, out.getRows().size()); ! params.set(0, m_tm.getObjectById("nelly")); ! params.set(1, m_tm.getObjectById("reptile")); out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(0, out.getRows().size()); ! } } --- 163,178 ---- params.add(b); m_predicate.setParameters(params); ! params.set(0, nelly); ! params.set(1, mammal); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(1, out.getRows().size()); ! params.set(0, nelly); ! params.set(1, reptile); out = m_predicate.matches(params, m_context); assertNotNull(out); assertEquals(0, out.getRows().size()); ! } } *************** *** 120,123 **** --- 180,188 ---- /* * $Log$ + * Revision 1.4 2005/03/07 12:32:00 lheuer + * More TM4J -> TMAPI translations + * Updated ToDo + * ResourcePredicate can handle Variants, too + * * Revision 1.3 2005/03/06 21:11:33 lheuer * More TM4J -> TMAPI translations |
|
From: Lars H. <lh...@us...> - 2005-03-07 12:32:12
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16920/src/org/tmapiutils/query/tolog/predicates Modified Files: AssociationRolePredicate.java ResourcePredicate.java TopicMapPredicate.java TypePredicate.java ValuePredicate.java VariantPredicate.java Log Message: More TM4J -> TMAPI translations Updated ToDo ResourcePredicate can handle Variants, too Index: VariantPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/VariantPredicate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** VariantPredicate.java 6 Mar 2005 17:30:00 -0000 1.1 --- VariantPredicate.java 7 Mar 2005 12:32:00 -0000 1.2 *************** *** 8,12 **** *$Header$ */ ! package org.tmapiutils.query.tolog.predicates; --- 8,12 ---- *$Header$ */ ! package org.tmapiutils.query.tolog.predicates; *************** *** 17,27 **** import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; ! import org.tmapi.core.TopicName; import org.tmapi.core.Topic; import org.tmapi.core.Variant; - import org.tmapi.core.VariantContainer; /** ! * * @author Kal Ahmed (ka...@te...) */ --- 17,27 ---- import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; ! // TMAPI import org.tmapi.core.Topic; + import org.tmapi.core.TopicName; import org.tmapi.core.Variant; /** ! * * @author Kal Ahmed (ka...@te...) */ *************** *** 33,37 **** new ParameterInfo(true) }; ! /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.PredicateBase#getParamInfo() --- 33,37 ---- new ParameterInfo(true) }; ! /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.PredicateBase#getParamInfo() *************** *** 115,123 **** private TopicName getTopicName(Variant variant) { ! VariantContainer parent = variant.getParent(); ! while (!(parent instanceof TopicName)) { ! parent = ((Variant)parent).getParent(); ! } ! return (TopicName)parent; } --- 115,124 ---- private TopicName getTopicName(Variant variant) { ! return variant.getTopicName(); ! // VariantContainer parent = variant.getParent(); ! // while (!(parent instanceof TopicName)) { ! // parent = ((Variant)parent).getParent(); ! // } ! // return (TopicName)parent; } *************** *** 140,143 **** --- 141,149 ---- /* * $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 Index: TopicMapPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/TopicMapPredicate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TopicMapPredicate.java 6 Mar 2005 17:30:00 -0000 1.1 --- TopicMapPredicate.java 7 Mar 2005 12:32:00 -0000 1.2 *************** *** 8,12 **** *$Header$ */ ! package org.tmapiutils.query.tolog.predicates; --- 8,12 ---- *$Header$ */ ! package org.tmapiutils.query.tolog.predicates; *************** *** 19,23 **** /** ! * * @author Kal Ahmed (ka...@te...) */ --- 19,23 ---- /** ! * * @author Kal Ahmed (ka...@te...) */ *************** *** 28,32 **** new ParameterInfo(true) }; ! /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.PredicateBase#getParamInfo() --- 28,32 ---- new ParameterInfo(true) }; ! /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.PredicateBase#getParamInfo() *************** *** 52,58 **** addResultsRow(ret, new Object[] { getTopicMap()}); } else if (params.get(0) instanceof TopicMap) { ! TopicMap tst = (TopicMap)params.get(0); if (tst.equals(getTopicMap())) { ! addResultsRow(ret, new Object[] { getTopicMap()}); } } --- 52,58 ---- addResultsRow(ret, new Object[] { getTopicMap()}); } else if (params.get(0) instanceof TopicMap) { ! TopicMap topicmap = (TopicMap)params.get(0); if (tst.equals(getTopicMap())) { ! addResultsRow(ret, new Object[] { topicmap }); } } *************** *** 65,68 **** --- 65,73 ---- /* * $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 Index: ValuePredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/ValuePredicate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ValuePredicate.java 6 Mar 2005 17:30:00 -0000 1.1 --- ValuePredicate.java 7 Mar 2005 12:32:00 -0000 1.2 *************** *** 8,12 **** *$Header$ */ ! package org.tmapiutils.query.tolog.predicates; --- 8,12 ---- *$Header$ */ ! package org.tmapiutils.query.tolog.predicates; *************** *** 19,31 **** import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; ! import org.tmapi.core.TopicName; ! import org.tmapi.core.DataObject; ! import org.tmapi.core.Occurrence; ! import org.tmapi.core.Topic; ! import org.tmapi.core.TopicMap; import org.tmapi.core.TopicMapObject; import org.tmapi.core.Variant; ! import org.tmapi.core.VariantContainer; ! import org.tmapi.core.Variant; import org.tmapi.index.core.TopicNamesIndex; import org.tmapi.index.core.OccurrencesIndex; --- 19,32 ---- import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; ! ! import org.tmapiutils.IndexUtils; ! // TMAPI import org.tmapi.core.TopicMapObject; + import org.tmapi.core.TopicMap; + import org.tmapi.core.Topic; + import org.tmapi.core.Occurrence; + import org.tmapi.core.TopicName; import org.tmapi.core.Variant; ! import org.tmapi.core.TMAPIException; import org.tmapi.index.core.TopicNamesIndex; import org.tmapi.index.core.OccurrencesIndex; *************** *** 33,45 **** /** ! * * @author Kal Ahmed (ka...@te...) */ public class ValuePredicate extends PredicateBase { ! private OccurrencesIndex m_odi; ! private TopicNamesIndex m_bni; ! private VariantsIndex m_vdi; ! public static final String PREDICATE_NAME = "value"; private static final ParameterInfo[] PARAM_INFO = new ParameterInfo[] { --- 34,46 ---- /** ! * * @author Kal Ahmed (ka...@te...) */ public class ValuePredicate extends PredicateBase { ! private OccurrencesIndex _occIdx; ! private TopicNamesIndex _tnIdx; ! private VariantsIndex _varIdx; ! public static final String PREDICATE_NAME = "value"; private static final ParameterInfo[] PARAM_INFO = new ParameterInfo[] { *************** *** 47,51 **** new ParameterInfo(true) }; ! /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.PredicateBase#getParamInfo() --- 48,52 ---- new ParameterInfo(true) }; ! /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.PredicateBase#getParamInfo() *************** *** 82,85 **** --- 83,102 ---- } + + private String getValue(TopicMapObject tmObj) { + String value = null; + if (tmObj instanceof Occurrence) { + value = ((Occurrence) tmObj).getValue(); + } + else if (tmObj instanceof TopicName) { + value = ((TopicName) tmObj).getValue(); + } + else if (tmObj instanceof Variant) { + value = ((Variant) tmObj).getValue(); + } + return value; + + } + /** * @param object *************** *** 87,98 **** */ private void matchValue(TopicMapObject object, VariableSet ret) throws TologProcessingException { ! 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,118 ---- */ private void matchValue(TopicMapObject object, VariableSet ret) throws TologProcessingException { ! ! 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,116 **** * @param ret */ ! private void matchObject(String data, VariableSet ret) throws TologProcessingException { ! for (Iterator it = m_odi.getOccurrencesByValue(data).iterator(); it.hasNext();) { addResultsRow(ret, new Object[] {it.next(), data}); } ! for (Iterator it = m_bni.getTopicNamesByValue(data).iterator(); it.hasNext();) { addResultsRow(ret, new Object[] { it.next(), data }); } ! for (Iterator it = m_vdi.getVariantsByValue(data).iterator(); it.hasNext();) { addResultsRow(ret, new Object[] { it.next(), data }); } --- 124,139 ---- * @param ret */ ! 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 }); } *************** *** 123,135 **** */ private void closedMatch(TopicMapObject object, String data, VariableSet ret) throws TologProcessingException { ! 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 }); ! } } } --- 146,164 ---- */ private void closedMatch(TopicMapObject object, String data, VariableSet ret) throws TologProcessingException { ! ! String value = getValue(object); ! if ((value != null) && value.equals(data)) { ! 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 }); + // } + // } } *************** *** 150,160 **** super.initialise(tm); try { ! m_bni = tm.getIndexManager().getTopicNamesIndex(); ! if (!m_bni.isOpen()) m_bni.open(); ! m_odi = tm.getIndexManager().getOccurrencesIndex(); ! if (!m_odi.isOpen()) m_odi.open(); ! m_vdi = tm.getIndexManager().getVariantsIndex(); ! if (!m_vdi.isOpen()) m_vdi.open(); ! } catch (Exception ex) { throw new TologParserException("Error initialising indexes for " + PREDICATE_NAME, ex); } --- 179,186 ---- super.initialise(tm); try { ! _occIdx = (OccurrencesIndex) tm.getHelperObject(OccurrencesIndex.class); ! _varIdx = (VariantsIndex) tm.getHelperObject(VariantsIndex.class); ! _tnIdx = (TopicNamesIndex) tm.getHelperObject(TopicNamesIndex.class); ! } catch (TMAPIException ex) { throw new TologParserException("Error initialising indexes for " + PREDICATE_NAME, ex); } *************** *** 164,172 **** private VariableSet m_vs; ! public ValuesExtractor(VariableSet vs) { m_vs = vs; } ! /* (non-Javadoc) * @see uk.co.jezuk.mango.UnaryFunction#fn(java.lang.Object) --- 190,198 ---- private VariableSet m_vs; ! public ValuesExtractor(VariableSet vs) { m_vs = vs; } ! /* (non-Javadoc) * @see uk.co.jezuk.mango.UnaryFunction#fn(java.lang.Object) *************** *** 186,195 **** } } ! private void addVariants(VariantContainer vc) throws TologProcessingException { for (Iterator it = vc.getVariants().iterator(); it.hasNext();) { ! Variant v = (Variant)it.next(); ! Variant vn = v.getVariant(); ! if ((vn != null) && (vn.getValue() != null)) { addResultsRow(m_vs, new Object[] { vn, vn.getValue() }); } --- 212,220 ---- } } ! 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() }); } *************** *** 203,206 **** --- 228,236 ---- /* * $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 Index: AssociationRolePredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/AssociationRolePredicate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AssociationRolePredicate.java 6 Mar 2005 19:37:22 -0000 1.2 --- AssociationRolePredicate.java 7 Mar 2005 12:32:00 -0000 1.3 *************** *** 18,21 **** --- 18,22 ---- import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; + // TMAPI import org.tmapi.core.Association; import org.tmapi.core.AssociationRole; *************** *** 23,27 **** /** * @author Kal ! * * Describe AssociationRolePredicate here. */ --- 24,28 ---- /** * @author Kal ! * * Describe AssociationRolePredicate here. */ *************** *** 33,37 **** new ParameterInfo(true, Object.class) }; ! /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.PredicateBase#getParamInfo() --- 34,38 ---- new ParameterInfo(true, Object.class) }; ! /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.PredicateBase#getParamInfo() *************** *** 56,60 **** VariableSet ret = new VariableSet(); initialiseResultsSet(ret); ! if ((assoc instanceof Association) && (role instanceof Variable)) { matchRoles((Association)assoc, ret); --- 57,61 ---- VariableSet ret = new VariableSet(); initialiseResultsSet(ret); ! if ((assoc instanceof Association) && (role instanceof Variable)) { matchRoles((Association)assoc, ret); *************** *** 109,112 **** --- 110,118 ---- /* * $Log$ + * Revision 1.3 2005/03/07 12:32:00 lheuer + * More TM4J -> TMAPI translations + * Updated ToDo + * ResourcePredicate can handle Variants, too + * * Revision 1.2 2005/03/06 19:37:22 lheuer * Changed getTopicByID to getObjectById Index: TypePredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/TypePredicate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TypePredicate.java 6 Mar 2005 21:11:33 -0000 1.2 --- TypePredicate.java 7 Mar 2005 12:32:00 -0000 1.3 *************** *** 8,12 **** *$Header$ */ ! package org.tmapiutils.query.tolog.predicates; --- 8,12 ---- *$Header$ */ ! package org.tmapiutils.query.tolog.predicates; *************** *** 18,40 **** import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; import org.tmapi.core.Association; import org.tmapi.core.AssociationRole; import org.tmapi.core.Occurrence; ! import org.tmapi.core.Topic; ! import org.tmapi.core.TopicMap; ! import org.tmapi.core.TopicMapObject; import org.tmapi.index.core.AssociationsIndex; import org.tmapi.index.core.AssociationRolesIndex; import org.tmapi.index.core.OccurrencesIndex; /** ! * * @author Kal Ahmed (ka...@te...) */ public class TypePredicate extends PredicateBase { ! private AssociationRolesIndex m_mti; ! private OccurrencesIndex m_oti; ! private AssociationsIndex m_ati; public static final String PREDICATE_NAME = "type"; private static final ParameterInfo PARAM_INFO [] = new ParameterInfo[] { --- 18,48 ---- import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; + + import org.tmapiutils.utils.IndexUtils; + // TMAPI + import org.tmapi.core.TopicMapObject; + import org.tmapi.core.TopicMap; + import org.tmapi.core.Topic; import org.tmapi.core.Association; import org.tmapi.core.AssociationRole; import org.tmapi.core.Occurrence; ! import org.tmapi.core.TopicName; ! import org.tmapi.core.TMAPIException; import org.tmapi.index.core.AssociationsIndex; import org.tmapi.index.core.AssociationRolesIndex; import org.tmapi.index.core.OccurrencesIndex; + import org.tmapi.index.core.TopicNamesIndex; /** ! * * @author Kal Ahmed (ka...@te...) */ public class TypePredicate extends PredicateBase { ! private AssociationsIndex _assocIdx; ! private AssociationRolesIndex _roleIdx; ! private OccurrencesIndex _occIdx; ! private TopicNamesIndex _tnIdx; ! public static final String PREDICATE_NAME = "type"; private static final ParameterInfo PARAM_INFO [] = new ParameterInfo[] { *************** *** 42,46 **** new ParameterInfo(true) }; ! /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.PredicateBase#getParamInfo() --- 50,54 ---- new ParameterInfo(true) }; ! /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.PredicateBase#getParamInfo() *************** *** 89,92 **** --- 97,102 ---- } else if (object instanceof Occurrence) { type = ((Occurrence)object).getType(); + } else if (object instanceof TopicName) { + type = ((TopicName) object).getType(); } if (type != null) { *************** *** 100,108 **** */ private void getTyped(Topic type, VariableSet ret) throws TologProcessingException { ! Iterator it = m_ati.getAssociationsByType(type).iterator(); addInstances(type, it, ret); ! it = m_oti.getOccurrencesByType(type).iterator(); addInstances(type, it, ret); ! it = m_mti.getAssociationRolesByType(type).iterator(); addInstances(type, it, ret); } --- 110,124 ---- */ private void getTyped(Topic type, VariableSet ret) throws TologProcessingException { ! IndexUtils.updateIndex(_assocIdx); ! Iterator it = _assocIdx.getAssociationsByType(type).iterator(); addInstances(type, it, ret); ! IndexUtils.updateIndex(_roleIdx); ! it = _roleIdx.getAssociationRolesByType(type).iterator(); addInstances(type, it, ret); ! IndexUtils.updateIndex(_occIdx); ! it = _occIdx.getOccurrencesByType(type).iterator(); ! addInstances(type, it, ret); ! IndexUtils.updateIndex(_tnIdx); ! it = _tnIdx.getOccurrencesByType(type).iterator(); addInstances(type, it, ret); } *************** *** 132,135 **** --- 148,153 ---- } else if (typed instanceof Occurrence) { match = type.equals(((Occurrence)typed).getType()); + } else if (typed instanceof TopicName) { + match = type.equals(((TopicName)typed).getType()); } if (match) { *************** *** 142,160 **** */ private void openMatch(VariableSet ret) throws TologProcessingException { ! for (Iterator types = m_ati.getAssociationTypes().iterator(); types.hasNext();) { Topic type = (Topic)types.next(); ! for (Iterator instances = m_ati.getAssociationsByType(type).iterator(); instances.hasNext();) { addResultsRow(ret, new Object[] { instances.next(), type }); } } ! for (Iterator types = m_oti.getOccurrenceTypes().iterator(); types.hasNext();) { Topic type = (Topic)types.next(); ! for (Iterator instances = m_oti.getOccurrencesByType(type).iterator(); instances.hasNext();) { addResultsRow(ret, new Object[] { instances.next(), type }); } } ! for (Iterator types = m_mti.getAssociationRoleTypes().iterator(); types.hasNext();) { Topic type = (Topic)types.next(); ! for (Iterator instances = m_mti.getAssociationRolesByType(type).iterator(); instances.hasNext();) { addResultsRow(ret, new Object[] { instances.next(), type }); } --- 160,188 ---- */ private void openMatch(VariableSet ret) throws TologProcessingException { ! IndexUtils.updateIndex(_assocIdx); ! for (Iterator types = _assocIdx.getAssociationTypes().iterator(); types.hasNext();) { Topic type = (Topic)types.next(); ! for (Iterator instances = _assocIdx.getAssociationsByType(type).iterator(); instances.hasNext();) { addResultsRow(ret, new Object[] { instances.next(), type }); } } ! IndexUtils.updateIndex(_roleIdx); ! for (Iterator types = _roleIdx.getAssociationRoleTypes().iterator(); types.hasNext();) { Topic type = (Topic)types.next(); ! for (Iterator instances = _roleIdx.getAssociationRolesByType(type).iterator(); instances.hasNext();) { addResultsRow(ret, new Object[] { instances.next(), type }); } } ! IndexUtils.updateIndex(_occIdx); ! for (Iterator types = _occIdx.getOccurrenceTypes().iterator(); types.hasNext();) { Topic type = (Topic)types.next(); ! for (Iterator instances = _occIdx.getOccurrencesByType(type).iterator(); instances.hasNext();) { ! addResultsRow(ret, new Object[] { instances.next(), type }); ! } ! } ! IndexUtils.updateIndex(_tnIdx); ! for (Iterator types = _tnIdx.getTopicNameTypes().iterator(); types.hasNext();) { ! Topic type = (Topic)types.next(); ! for (Iterator instances = _tnIdx.getTopicNamesByType(type).iterator(); instances.hasNext();) { addResultsRow(ret, new Object[] { instances.next(), type }); } *************** *** 168,178 **** super.initialise(tm); try { ! m_ati = tm.getIndexManager().getAssociationsIndex(); ! if (!m_ati.isOpen()) m_ati.open(); ! m_oti = tm.getIndexManager().getOccurrencesIndex(); ! if (!m_oti.isOpen()) m_oti.open(); ! m_mti = tm.getIndexManager().getAssociationRolesIndex(); ! if (!m_mti.isOpen()) m_mti.open(); ! } catch (Exception ex) { throw new TologParserException("Error initialising indexes for predicate " + PREDICATE_NAME, ex); } --- 196,204 ---- super.initialise(tm); try { ! _assocIdx = (AssociationsIndex) tm.getHelperObject(AssociationsIndex.class); ! _roleIdx = (AssociationRolesIndex) tm.getHelperObject(AssociationRolesIndex.class); ! _occIdx = (OccurrencesIndex) tm.getHelperObject(OccurrencesIndex.class); ! _tnIdx = (TopicNamesIndex) tm.getHelperObject(TopicNamesIndex.class); ! } catch (TMAPIException ex) { throw new TologParserException("Error initialising indexes for predicate " + PREDICATE_NAME, ex); } *************** *** 184,187 **** --- 210,218 ---- /* * $Log$ + * Revision 1.3 2005/03/07 12:32:00 lheuer + * More TM4J -> TMAPI translations + * Updated ToDo + * ResourcePredicate can handle Variants, too + * * Revision 1.2 2005/03/06 21:11:33 lheuer * More TM4J -> TMAPI translations Index: ResourcePredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/ResourcePredicate.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ResourcePredicate.java 6 Mar 2005 22:36:52 -0000 1.3 --- ResourcePredicate.java 7 Mar 2005 12:32:00 -0000 1.4 *************** *** 26,34 **** /** * @author Kal ! * * Describe ResourcePredicate here. */ public class ResourcePredicate extends PredicateBase { ! public static final String PREDICATE_NAME = "resource"; private static final ParameterInfo[] PARAM_INFO = new ParameterInfo[] { --- 26,34 ---- /** * @author Kal ! * * Describe ResourcePredicate here. */ public class ResourcePredicate extends PredicateBase { ! public static final String PREDICATE_NAME = "resource"; private static final ParameterInfo[] PARAM_INFO = new ParameterInfo[] { *************** *** 39,43 **** private OccurrencesIndex _occIdx; private VariantsIndex _varIdx; ! /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.PredicateBase#getParamInfo() --- 39,43 ---- private OccurrencesIndex _occIdx; private VariantsIndex _varIdx; ! /* (non-Javadoc) * @see org.tmapiutils.query.tolog.predicates.PredicateBase#getParamInfo() *************** *** 62,67 **** VariableSet ret = new VariableSet(); initialiseResultsSet(ret); ! ! if ((object instanceof Occurrence) || (object instanceof Variant)) { Locator resource = getResource(object); if (locator instanceof Locator) { --- 62,67 ---- VariableSet ret = new VariableSet(); initialiseResultsSet(ret); ! ! if ((object instanceof TopicMapObject)) { Locator resource = getResource(object); if (locator instanceof Locator) { *************** *** 110,116 **** } } ! } return ret; ! // if ((object instanceof DataObject) && (locator instanceof Variable)) { // DataObject d = (DataObject)object; --- 110,116 ---- } } ! } return ret; ! // if ((object instanceof DataObject) && (locator instanceof Variable)) { // DataObject d = (DataObject)object; *************** *** 153,161 **** */ private Locator getResource(TopicMapObject dataObject) { ! if (object instanceof Occurrence) { ! return ((Occurrence) object).getResource(); } else { ! return ((Variant) object).getResource(); } } --- 153,161 ---- */ private Locator getResource(TopicMapObject dataObject) { ! if (dataObject instanceof Occurrence) { ! return ((Occurrence) dataObject).getResource(); } else { ! return ((Variant) dataObject).getResource(); } } *************** *** 171,175 **** _varIdx = (VariantsIndex) tm.getHelperObject(VariantsIndex.class); } catch (TMAPIException ex) { ! throw new TologParserException("Error initialising index for " + PREDICATE_NAME, ex); } } --- 171,175 ---- _varIdx = (VariantsIndex) tm.getHelperObject(VariantsIndex.class); } catch (TMAPIException ex) { ! throw new TologParserException("Error initialising index for " + PREDICATE_NAME, ex); } } |
|
From: Lars H. <lh...@us...> - 2005-03-07 12:32:10
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16920/src/org/tmapiutils/query/tolog Modified Files: todo-log.txt Log Message: More TM4J -> TMAPI translations Updated ToDo ResourcePredicate can handle Variants, too Index: todo-log.txt =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/todo-log.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** todo-log.txt 6 Mar 2005 23:38:11 -0000 1.6 --- todo-log.txt 7 Mar 2005 12:32:00 -0000 1.7 *************** *** 34,48 **** - File: query\tolog\predicates\TypePredicate.java - line: 170 - getIndexManager() - Should become getHelperObject(IndexInterface.class) - line: 172 - getIndexManager() - Should become getHelperObject(IndexInterface.class) - line: 174 - getIndexManager() - Should become getHelperObject(IndexInterface.class) - File: query\tolog\predicates\ValueLikePredicate.java line: 114 --- 34,37 ---- *************** *** 50,119 **** Should become getHelperObject(IndexInterface.class) - File: query\tolog\predicates\ValuePredicate.java - line: 22 - DataObject - DataObject has no equivalent in TMAPI (either an Occurrence or a Variant) - line: 28 - VariantContainer - VariantContainer does not exist in TMAPI (a TopicName is a VariantContainer) - line: 90 - DataObject - DataObject has no equivalent in TMAPI (either an Occurrence or a Variant) - line: 91 - DataObject - DataObject has no equivalent in TMAPI (either an Occurrence or a Variant) - line: 125 - DataObject - DataObject has no equivalent in TMAPI (either an Occurrence or a Variant) - line: 126 - DataObject - DataObject has no equivalent in TMAPI (either an Occurrence or a Variant) - line: 152 - getIndexManager() - Should become getHelperObject(IndexInterface.class) - line: 154 - getIndexManager() - Should become getHelperObject(IndexInterface.class) - line: 156 - getIndexManager() - Should become getHelperObject(IndexInterface.class) - line: 189 - VariantContainer - VariantContainer does not exist in TMAPI (a TopicName is a VariantContainer) - - File: query\tolog\predicates\VariantPredicate.java - line: 22 - VariantContainer - VariantContainer does not exist in TMAPI (a TopicName is a VariantContainer) - line: 117 - VariantContainer - VariantContainer does not exist in TMAPI (a TopicName is a VariantContainer) - line: 117 - getParent() - Cannot resolve getParent - line: 119 - getParent() - Cannot resolve getParent - - - File: query\tolog\predicates\test\AssociationRolePredicateTest.java - line: 65 - getParent() - Cannot resolve getParent - line: 70 - getParent() - Cannot resolve getParent - line: 79 - getParent() - Cannot resolve getParent - line: 80 - getParent() - Cannot resolve getParent - line: 97 - getParent() - Cannot resolve getParent - line: 110 - getParent() - Cannot resolve getParent --- 39,42 ---- *************** *** 159,182 **** - File: query\tolog\predicates\test\PredicateTestBase.java - line: 20 - TopicMapProvider - Usage of TopicMapProvider cannot be translated 1:1 to TopicMapSystem - line: 21 - TopicMapProvider - Usage of TopicMapProvider cannot be translated 1:1 to TopicMapSystem - line: 22 - TopicMapProvider - Usage of TopicMapProvider cannot be translated 1:1 to TopicMapSystem - line: 36 - TopicMapProvider - Usage of TopicMapProvider cannot be translated 1:1 to TopicMapSystem - line: 51 - TopicMapProvider - Usage of TopicMapProvider cannot be translated 1:1 to TopicMapSystem - line: 52 - TopicMapProvider - Usage of TopicMapProvider cannot be translated 1:1 to TopicMapSystem - File: query\tolog\predicates\test\TypePredicateTest.java --- 82,85 ---- |
|
From: Lars H. <lh...@us...> - 2005-03-07 00:56:09
|
Update of /cvsroot/tmapi-utils/tmapi-utils/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16714/utils Modified Files: terminology.py Log Message: Added XTMBuilder as critical thing Index: terminology.py =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/utils/terminology.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** terminology.py 6 Mar 2005 23:37:06 -0000 1.9 --- terminology.py 7 Mar 2005 00:55:58 -0000 1.10 *************** *** 105,108 **** --- 105,109 ---- 'LocatorFactory':'Has become org.tmapi.core.LocatorFactory<Exception>. Has no TMAPI equivalent', 'LTMBuilder':'Has become core.utils.LTMBuilder. No equivalent in TMAPI / TMAPIUtils', + 'XTMBuilder':'Has become core.utils.XTMBuilder. No equivalent in TMAPI / TMAPIUtils', 'Lucene':'Fulltext index not available', 'SerializedTopicMap':'No equivalent', |
|
From: Lars H. <lh...@us...> - 2005-03-06 23:38:21
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28741/src/org/tmapiutils/query/tolog Modified Files: todo-log.txt Log Message: Updated ToDo list Index: todo-log.txt =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/todo-log.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** todo-log.txt 6 Mar 2005 22:45:22 -0000 1.5 --- todo-log.txt 6 Mar 2005 23:38:11 -0000 1.6 *************** *** 33,74 **** - File: query\tolog\predicates\ScopePredicate.java - line: 73 - getScopedObjects( - Could be getScopedObjectsByScopingTopic or ..ByScopingTopics - line: 97 - getScopedObjects( - Could be getScopedObjectsByScopingTopic or ..ByScopingTopics - line: 118 - getIndexManager() - Should become getHelperObject(IndexInterface.class) - - File: query\tolog\predicates\SourceLocatorsPredicate.java - line: 93 - getObjectBySourceLocator( - TopicMap.getObjectBySourceLocator -> TopicMapObjectsIndex.getTopicMapObjectBySourceLocator - - File: query\tolog\predicates\SubjectIdentifierPredicate.java - line: 94 - getTopicBySubjectIndicator( - TopicMap.getTopicBySubjectIndicator -> TopicsIndex.getTopicBySubjectIdentifier - - File: query\tolog\predicates\SubjectLocatorPredicate.java - line: 70 - getSubject() - Replaced just getSubject() -> getSubjectLocators(). ToDo: .iterator().next() or something - line: 71 - getSubject() - Replaced just getSubject() -> getSubjectLocators(). ToDo: .iterator().next() or something - line: 82 - getSubject() - Replaced just getSubject() -> getSubjectLocators(). ToDo: .iterator().next() or something - line: 92 - getTopicBySubject( - TopicMap.getTopicBySubject -> TopicsIndex.getTopicBySubjectLocator - line: 103 - getSubject() - Replaced just getSubject() -> getSubjectLocators(). ToDo: .iterator().next() or something - File: query\tolog\predicates\TypePredicate.java --- 33,36 ---- |
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28637/src/org/tmapiutils/query/tolog/predicates Modified Files: ScopePredicate.java SourceLocatorsPredicate.java SubjectIdentifierPredicate.java SubjectLocatorPredicate.java Log Message: More TM4J -> TMAPI translations Index: ScopePredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/ScopePredicate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScopePredicate.java 6 Mar 2005 17:30:00 -0000 1.1 --- ScopePredicate.java 6 Mar 2005 23:38:00 -0000 1.2 *************** *** 12,19 **** import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; import org.tmapi.core.ScopedObject; import org.tmapi.core.Topic; ! import org.tmapi.core.TopicMap; ! import org.tmapi.index.core.ThemesIndex; /** --- 12,24 ---- import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; + + import org.tmapiutils.utils.IndexUtils; + + // TMAPI + import org.tmapi.core.TopicMap; import org.tmapi.core.ScopedObject; import org.tmapi.core.Topic; ! import org.tmapi.core.TMAPIException; ! import org.tmapi.index.core.ScopedObjectsIndex; /** *************** *** 24,28 **** public class ScopePredicate extends PredicateBase { ! private ThemesIndex m_ti; public static final String PREDICATE_NAME = "scope"; private static final ParameterInfo[] PARAM_INFO = new ParameterInfo[]{ --- 29,33 ---- public class ScopePredicate extends PredicateBase { ! private ScopedObjectsIndex _scopeIdx; public static final String PREDICATE_NAME = "scope"; private static final ParameterInfo[] PARAM_INFO = new ParameterInfo[]{ *************** *** 69,75 **** */ private void openMatch(VariableSet ret) throws TologProcessingException { ! for (Iterator themes = m_ti.getScopingTopics().iterator(); themes.hasNext();){ ! Topic theme = (Topic)themes.next(); ! for (Iterator scoped = m_ti.getScopedObjects(theme).iterator(); scoped.hasNext();) { addResultsRow(ret, new Object[] {scoped.next(), theme}); } --- 74,81 ---- */ private void openMatch(VariableSet ret) throws TologProcessingException { ! IndexUtils.updateIndex(_scopeIdx); ! for (Iterator themes = _scopeIdx.getScopingTopics().iterator(); themes.hasNext();){ ! Topic topic = (Topic) themes.next(); ! for (Iterator scoped = _scopeIdx.getScopedObjectsByScopingTopic(topic).iterator(); scoped.hasNext();) { addResultsRow(ret, new Object[] {scoped.next(), theme}); } *************** *** 94,100 **** * @param ret */ ! private void matchScopedObjects(Topic theme, VariableSet ret) throws TologProcessingException { ! for (Iterator it = m_ti.getScopedObjects(theme).iterator(); it.hasNext();) { ! addResultsRow(ret, new Object[] {it.next(), theme}); } } --- 100,107 ---- * @param ret */ ! private void matchScopedObjects(Topic topic, VariableSet ret) throws TologProcessingException { ! IndexUtils.updateIndex(_scopeIdx); ! for (Iterator it = _scopeIdx.getScopedObjectsByScopingTopic(topic).iterator(); it.hasNext();) { ! addResultsRow(ret, new Object[] {it.next(), topic}); } } *************** *** 116,124 **** super.initialise(tm); try { ! m_ti = tm.getIndexManager().getThemesIndex(); ! if (!m_ti.isOpen()) { ! m_ti.open(); ! } ! } catch (Exception ex) { throw new TologParserException("Unable to initialise indexes for " + PREDICATE_NAME, ex); } --- 123,128 ---- super.initialise(tm); try { ! _scopeIdx = (ScopedObjectsIndex) tm.getHelperObject(ScopedObjectsIndex.class); ! } catch (TMAPIException ex) { throw new TologParserException("Unable to initialise indexes for " + PREDICATE_NAME, ex); } Index: SubjectIdentifierPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/SubjectIdentifierPredicate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SubjectIdentifierPredicate.java 6 Mar 2005 18:14:09 -0000 1.2 --- SubjectIdentifierPredicate.java 6 Mar 2005 23:38:00 -0000 1.3 *************** *** 8,16 **** import java.util.List; - import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.TologProcessingException; import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; import org.tmapi.core.Topic; /** --- 8,21 ---- import java.util.List; import org.tmapiutils.query.tolog.TologProcessingException; import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; + + import org.tmapiutils.utils.IndexUtils; + // TMAPI + import org.tmapi.core.Locator; import org.tmapi.core.Topic; + import org.tmapi.core.TMAPIException; + import org.tmapi.index.core.TopicsIndex; /** *************** *** 21,24 **** --- 26,30 ---- public class SubjectIdentifierPredicate extends PredicateBase { + private TopicsIndex _topicsIdx; public static final String PREDICATE_NAME = "subject-identifier"; private static final ParameterInfo[] PARAM_INFO = new ParameterInfo[] { *************** *** 79,87 **** * @param ret */ ! private void closedMatch(Topic t, Locator locator, VariableSet ret) throws TologProcessingException { ! for (Iterator si = t.getSubjectIdentifiers().iterator(); si.hasNext();) { ! if (si.next().equals(locator)) { ! addResultsRow(ret, new Object[] { t, locator}); ! } } } --- 85,91 ---- * @param ret */ ! private void closedMatch(Topic topic, Locator locator, VariableSet ret) throws TologProcessingException { ! if (topic.getSubjectIdentifiers().contains(locator)) { ! addResultsRow(ret, new Object[] { topic, locator}); } } *************** *** 92,98 **** */ private void matchTopic(Locator locator, VariableSet ret) throws TologProcessingException { ! Topic t = getTopicMap().getTopicBySubjectIndicator(locator); ! if (t != null) { ! addResultsRow(ret, new Object[] { t, locator }); } } --- 96,103 ---- */ private void matchTopic(Locator locator, VariableSet ret) throws TologProcessingException { ! IndexUtils.updateIndex(_topicsIdx); ! Topic topic = _topicsIdx.getTopicBySubjectIdentifier(locator); ! if (topic != null) { ! addResultsRow(ret, new Object[] { topic, locator }); } } *************** *** 108,110 **** --- 113,126 ---- } + /* (non-Javadoc) + * @see org.tmapiutils.query.tolog.parser.Predicate#initialise(org.tmapi.core.TopicMap) + */ + public void initialise(TopicMap tm) throws TologParserException { + super.initialise(tm); + try { + _topicsIdx = (TopicsIndex) tm.getHelperObject(TopicsIndex.class); + } catch (TMAPIException ex) { + throw new TologParserException("Unable to initialise indexes for " + PREDICATE_NAME, ex); + } + } } Index: SubjectLocatorPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/SubjectLocatorPredicate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SubjectLocatorPredicate.java 6 Mar 2005 18:14:09 -0000 1.2 --- SubjectLocatorPredicate.java 6 Mar 2005 23:38:00 -0000 1.3 *************** *** 8,16 **** import java.util.List; - import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.TologProcessingException; import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; import org.tmapi.core.Topic; /** --- 8,21 ---- import java.util.List; import org.tmapiutils.query.tolog.TologProcessingException; import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; + + import org.tmapiutils.utils.IndexUtils; + // TMAPI + import org.tmapi.core.Locator; import org.tmapi.core.Topic; + import org.tmapi.core.TMAPIException; + import org.tmapi.index.core.TopicsIndex; /** *************** *** 21,24 **** --- 26,30 ---- public class SubjectLocatorPredicate extends PredicateBase { + private TopicsIndex _topicsIdx; public static final String PREDICATE_NAME = "subject-locator"; private static final ParameterInfo[] PARAM_INFO = new ParameterInfo[] { *************** *** 67,73 **** private void openMatch(VariableSet ret) throws TologProcessingException { for (Iterator it = getTopicMap().getTopics().iterator(); it.hasNext();) { ! Topic t = (Topic)it.next(); ! if (t.getSubjectLocators() != null) { ! addResultsRow(ret, new Object[] { t, t.getSubjectLocators()}); } } --- 73,79 ---- private void openMatch(VariableSet ret) throws TologProcessingException { for (Iterator it = getTopicMap().getTopics().iterator(); it.hasNext();) { ! Topic topic = (Topic)it.next(); ! for (Iterator locIter = topic.getSubjectLocators().iterator(); locIter.hasNext();) { ! addResultsRow(ret, new Object[] { topic, locIter.next()}); } } *************** *** 79,85 **** * @param ret */ ! private void closedMatch(Topic t, Locator locator, VariableSet ret) throws TologProcessingException { ! if (t.getSubjectLocators().equals(locator)) { ! addResultsRow(ret, new Object[] { t, locator}); } } --- 85,91 ---- * @param ret */ ! private void closedMatch(Topic topic, Locator locator, VariableSet ret) throws TologProcessingException { ! if (topic.getSubjectLocators().contains(locator)) { ! addResultsRow(ret, new Object[] { topic, locator}); } } *************** *** 90,96 **** */ private void matchTopic(Locator locator, VariableSet ret) throws TologProcessingException { ! Topic t = getTopicMap().getTopicBySubject(locator); ! if (t != null) { ! addResultsRow(ret, new Object[] { t, locator }); } } --- 96,103 ---- */ private void matchTopic(Locator locator, VariableSet ret) throws TologProcessingException { ! IndexUtils.updateIndex(_topicsIdx); ! Topic topic = _topicsIdx.getTopicBySubjectLocator(locator); ! if (topic != null) { ! addResultsRow(ret, new Object[] { topic, locator }); } } *************** *** 100,105 **** * @param ret */ ! private void matchSubjectLocator(Topic t, VariableSet ret) throws TologProcessingException { ! addResultsRow(ret, new Object[] { t, t.getSubjectLocators()}); } --- 107,126 ---- * @param ret */ ! private void matchSubjectLocator(Topic topic, VariableSet ret) throws TologProcessingException { ! for (Iterator iter = topic.getSubjectLocators().iterator(); iter.hasNext();) { ! addResultsRow(ret, new Object[] { topic, iter.next()}); ! } ! } ! ! /* (non-Javadoc) ! * @see org.tmapiutils.query.tolog.parser.Predicate#initialise(org.tmapi.core.TopicMap) ! */ ! public void initialise(TopicMap tm) throws TologParserException { ! super.initialise(tm); ! try { ! _topicsIdx = (TopicsIndex) tm.getHelperObject(TopicsIndex.class); ! } catch (TMAPIException ex) { ! throw new TologParserException("Unable to initialise indexes for " + PREDICATE_NAME, ex); ! } } Index: SourceLocatorsPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/SourceLocatorsPredicate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SourceLocatorsPredicate.java 6 Mar 2005 18:14:09 -0000 1.2 --- SourceLocatorsPredicate.java 6 Mar 2005 23:38:00 -0000 1.3 *************** *** 8,16 **** import java.util.List; - import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.TologProcessingException; import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; import org.tmapi.core.TopicMapObject; /** --- 8,25 ---- import java.util.List; import org.tmapiutils.query.tolog.TologProcessingException; import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; + + import org.tmapiutils.utils.IndexUtils; + // TMAPI + import org.tmapi.core.Locator; import org.tmapi.core.TopicMapObject; + import org.tmapi.core.TopicMap; + import org.tmapi.core.Topic; + import org.tmapi.core.Association; + import org.tmapi.core.TopicName; + import org.tmapi.core.TMAPIException; + import org.tmapi.index.core.TopicMapObjectsIndex; /** *************** *** 21,24 **** --- 30,35 ---- public class SourceLocatorsPredicate extends PredicateBase { + private TopicMapObjectsIndex _tmoIdx; + public static final String PREDICATE_NAME = "source-locator"; private static final ParameterInfo [] PARAM_INFO = new ParameterInfo [] { *************** *** 41,44 **** --- 52,68 ---- } + + /* (non-Javadoc) + * @see org.tmapiutils.query.tolog.parser.Predicate#initialise(org.tmapi.core.TopicMap) + */ + public void initialise(TopicMap tm) throws TologParserException { + super.initialise(tm); + try { + _tmoIdx = (TopicMapObjectsIndex) tm.getHelperObject(TopicMapObjectsIndex.class); + } catch (TMAPIException ex) { + throw new TologParserException("Unable to initialise indexes for " + PREDICATE_NAME, ex); + } + } + /* (non-Javadoc) * @see org.tmapiutils.query.tolog.parser.Predicate#matches(java.util.List) *************** *** 61,74 **** } /** * @param ret */ private void openMatch(VariableSet ret) throws TologProcessingException { ! for (Iterator it = getTopicMap().getObjects().iterator(); it.hasNext();) { ! TopicMapObject tmo = (TopicMapObject)it.next(); ! for (Iterator l = tmo.getSourceLocators().iterator(); l.hasNext();) { ! addResultsRow(ret, new Object[] {tmo, l.next()}); ! } ! } } --- 85,121 ---- } + + private void addSourceLocators(TopicMapObject tmObj) { + for (Iterator iter = tmObj.getSourceLocators().iter(); iter.hasNext();) { + addResultsRow(ret, new Object[] {tmObj, iter.next()}); + } + } + /** * @param ret */ private void openMatch(VariableSet ret) throws TologProcessingException { ! addSourceLocators(getTopicMap()); ! for (Iterator topicIter = getTopicMap().getTopics().iterator(); topicIter.hasNext();) { ! Topic topic = (Topic) topicIter.next(); ! addSourceLocators(topic); ! for (Iterator occIter = topic.getOccurrences().iterator(); occIter.hasNext();) { ! addSourceLocators((TopicMapObject) occIter.next()); ! } ! for (Iterator tnIter = topic.getTopicNames().iterator(); tnIter.hasNext();) { ! TopicName tn = (TopicName) tnIter.next(); ! addSourceLocators(tn); ! for (Iterator varIter = tn.getVariants().iterator(); varIter.hasNext();) { ! addSourceLocator((TopicMapObject) varIter.next()); ! } ! } ! } ! for (Iterator iter = getTopicMap().getAssociations().iterator(); iter.hasNext();) { ! Association assoc = (Association) iter.next(); ! addSourceLocators(assoc); ! for (Iterator roleIter = assoc.getAssociationRoles().iterator(); iter.hasNext();) { ! addSourceLocators((TopicMapObject) iter.next()); ! } ! } } *************** *** 79,85 **** */ private void closedMatch(TopicMapObject tmo, Locator locator, VariableSet ret) throws TologProcessingException { ! for (Iterator l = tmo.getSourceLocators().iterator(); l.hasNext();) { ! if (l.next().equals(locator)) { addResultsRow(ret, new Object[] {tmo, locator}); } } --- 126,133 ---- */ private void closedMatch(TopicMapObject tmo, Locator locator, VariableSet ret) throws TologProcessingException { ! for (Iterator iter = tmo.getSourceLocators().iterator(); iter.hasNext();) { ! if (iter.next().equals(locator)) { addResultsRow(ret, new Object[] {tmo, locator}); + return; } } *************** *** 91,95 **** */ private void matchObject(Locator locator, VariableSet ret) throws TologProcessingException { ! TopicMapObject tmo = getTopicMap().getObjectBySourceLocator(locator); if (tmo != null) { addResultsRow(ret, new Object[] {tmo, locator}); --- 139,144 ---- */ private void matchObject(Locator locator, VariableSet ret) throws TologProcessingException { ! IndexUtils.updateIndex(_tmoIdx); ! TopicMapObject tmo = _tmoIdx.getTopicMapObjectBySourceLocator(locator); if (tmo != null) { addResultsRow(ret, new Object[] {tmo, locator}); |
|
From: Lars H. <lh...@us...> - 2005-03-06 23:37:19
|
Update of /cvsroot/tmapi-utils/tmapi-utils/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28388/utils Modified Files: terminology.py Log Message: More translations (ThemeIndex) Index: terminology.py =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/utils/terminology.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** terminology.py 6 Mar 2005 21:12:03 -0000 1.8 --- terminology.py 6 Mar 2005 23:37:06 -0000 1.9 *************** *** 29,33 **** 'AssociationRoleTypesIndex':'AssociationRolesIndex', # if Member -> AssociationRole replacement 'TopicTypesIndex':'TopicsIndex', ! 'AssociationTypesIndex':'AssociationsIndex', # AssociationRole 'Member':'AssociationRole', --- 29,34 ---- 'AssociationRoleTypesIndex':'AssociationRolesIndex', # if Member -> AssociationRole replacement 'TopicTypesIndex':'TopicsIndex', ! 'AssociationTypesIndex':'AssociationsIndex', ! 'ThemesIndex':'ScopedObjectsIndex', # AssociationRole 'Member':'AssociationRole', |
|
From: Lars H. <lh...@us...> - 2005-03-06 22:45:31
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14857/src/org/tmapiutils/query/tolog Modified Files: todo-log.txt Log Message: Updated ToDo list Index: todo-log.txt =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/todo-log.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** todo-log.txt 6 Mar 2005 22:36:53 -0000 1.4 --- todo-log.txt 6 Mar 2005 22:45:22 -0000 1.5 *************** *** 72,90 **** - File: query\tolog\predicates\TopicNamePredicate.java - line: 82 - getParent() - Cannot resolve getParent - line: 87 - getParent() - Cannot resolve getParent - line: 99 - getParent() - Cannot resolve getParent - line: 114 - getIndexManager() - Should become getHelperObject(IndexInterface.class) - - File: query\tolog\predicates\TypePredicate.java line: 170 --- 72,75 ---- |
|
From: Lars H. <lh...@us...> - 2005-03-06 22:45:04
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14734/src/org/tmapiutils/query/tolog/predicates Modified Files: TopicNamePredicate.java Log Message: More TM4J -> TMAPI translations Index: TopicNamePredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/TopicNamePredicate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TopicNamePredicate.java 6 Mar 2005 17:30:00 -0000 1.1 --- TopicNamePredicate.java 6 Mar 2005 22:44:55 -0000 1.2 *************** *** 20,27 **** import org.tmapiutils.query.tolog.predicates.PredicateBase; import org.tmapiutils.query.tolog.utils.VariableSet; ! import org.tmapi.core.TopicName; ! import org.tmapi.core.Topic; import org.tmapi.core.TopicMap; ! import org.tmapi.core.index.IndexManagerException; import org.tmapi.index.core.TopicNamesIndex; --- 20,28 ---- import org.tmapiutils.query.tolog.predicates.PredicateBase; import org.tmapiutils.query.tolog.utils.VariableSet; ! // TMAPI import org.tmapi.core.TopicMap; ! import org.tmapi.core.Topic; ! import org.tmapi.core.TopicName; ! import org.tmapi.core.TMAPIException; import org.tmapi.index.core.TopicNamesIndex; *************** *** 32,36 **** */ public class TopicNamePredicate extends PredicateBase { ! private TopicNamesIndex idx=null; public static final String PREDICATE_NAME = "topic-name"; --- 33,37 ---- */ public class TopicNamePredicate extends PredicateBase { ! // private TopicNamesIndex idx=null; public static final String PREDICATE_NAME = "topic-name"; *************** *** 85,89 **** */ /* Simple version returns only the parent of the paramName parameter */ ! addResultsRow(ret, new Object [] { ((TopicName)paramName).getParent(), paramName}); } else if((paramName instanceof Variable) && (paramTopic instanceof Topic)) { --- 86,90 ---- */ /* Simple version returns only the parent of the paramName parameter */ ! addResultsRow(ret, new Object [] { ((TopicName)paramName).getTopic(), paramName}); } else if((paramName instanceof Variable) && (paramTopic instanceof Topic)) { *************** *** 97,101 **** else if((paramName instanceof TopicName) && (paramTopic instanceof Topic)) { // KA: Only add the row if paramName is a name of paramTopic ! if (((TopicName)paramName).getParent().equals(paramTopic)) { addResultsRow(ret, new Object[] {paramTopic, paramName}); } --- 98,102 ---- else if((paramName instanceof TopicName) && (paramTopic instanceof Topic)) { // KA: Only add the row if paramName is a name of paramTopic ! if (((TopicName)paramName).getTopic().equals(paramTopic)) { addResultsRow(ret, new Object[] {paramTopic, paramName}); } *************** *** 111,119 **** super.initialise(tm); try { ! idx = getTopicMap().getIndexManager().getTopicNamesIndex(); ! } catch (IndexManagerException e) { throw new TologParserException("Cannot initialize " + getPredicateName() + " predicate class", e); } } } --- 112,122 ---- super.initialise(tm); + /* try { ! _tnIdx = (TopicNamesIndex) getTopicMap().getHelperObject(TopicNamesIndex.class); ! } catch (TMAPIException e) { throw new TologParserException("Cannot initialize " + getPredicateName() + " predicate class", e); } + */ } } *************** *** 121,124 **** --- 124,130 ---- /* * $Log$ + * Revision 1.2 2005/03/06 22:44:55 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:30:00 lheuer * Initial tolog import |
|
From: Lars H. <lh...@us...> - 2005-03-06 22:37:06
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12826/src/org/tmapiutils/query/tolog Modified Files: todo-log.txt Log Message: More TM4J -> TMAPI translations Index: todo-log.txt =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/todo-log.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** todo-log.txt 6 Mar 2005 21:39:42 -0000 1.3 --- todo-log.txt 6 Mar 2005 22:36:53 -0000 1.4 *************** *** 33,73 **** - File: query\tolog\predicates\ResourcePredicate.java - line: 15 - DataObject - DataObject has no equivalent in TMAPI (either an Occurrence or a Variant) - line: 56 - DataObject - DataObject has no equivalent in TMAPI (either an Occurrence or a Variant) - line: 57 - DataObject - DataObject has no equivalent in TMAPI (either an Occurrence or a Variant) - line: 72 - DataObject - DataObject has no equivalent in TMAPI (either an Occurrence or a Variant) - line: 73 - DataObject - DataObject has no equivalent in TMAPI (either an Occurrence or a Variant) - line: 80 - DataObject - DataObject has no equivalent in TMAPI (either an Occurrence or a Variant) - line: 81 - DataObject - DataObject has no equivalent in TMAPI (either an Occurrence or a Variant) - line: 95 - getIndexManager() - Should become getHelperObject(IndexInterface.class) - - File: query\tolog\predicates\RolePlayerPredicate.java - line: 75 - getPlayers() - AssociationRole can have only one player - line: 89 - getPlayers() - AssociationRole can have only one player - line: 101 - getPlayers() - AssociationRole can have only one player - File: query\tolog\predicates\ScopePredicate.java line: 73 --- 33,36 ---- |
|
From: Lars H. <lh...@us...> - 2005-03-06 22:37:03
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12826/src/org/tmapiutils/query/tolog/predicates Modified Files: ResourcePredicate.java RolePlayerPredicate.java Log Message: More TM4J -> TMAPI translations Index: RolePlayerPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/RolePlayerPredicate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RolePlayerPredicate.java 6 Mar 2005 17:30:00 -0000 1.1 --- RolePlayerPredicate.java 6 Mar 2005 22:36:53 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; + // TMAPI import org.tmapi.core.Association; import org.tmapi.core.AssociationRole; *************** *** 71,79 **** while (it.hasNext()) { Association a = (Association)it.next(); ! for (Iterator members = a.getAssociationRoles().iterator();members.hasNext();) { ! AssociationRole m = (AssociationRole)members.next(); ! for (Iterator players = m.getPlayers().iterator(); players.hasNext();) { ! Topic p = (Topic)players.next(); ! addResultsRow(ret, new Object[] {m, p}); } } --- 72,79 ---- while (it.hasNext()) { Association a = (Association)it.next(); ! for (Iterator roles = a.getAssociationRoles().iterator(); roles.hasNext();) { ! AssociationRole role = (AssociationRole) roles.next(); ! if (role.getPlayer() != null) { ! addResultsRow(ret, new Object[] {role, role.getPlayer()}); } } *************** *** 86,95 **** * @param ret */ ! private void closedMatch(AssociationRole member, Topic topic, VariableSet ret) throws TologProcessingException { ! for (Iterator it = member.getPlayers().iterator(); it.hasNext();) { ! if (it.next().equals(topic)) { ! addResultsRow(ret, new Object[] {member, topic}); ! } ! } } --- 86,94 ---- * @param ret */ ! private void closedMatch(AssociationRole role, Topic topic, VariableSet ret) throws TologProcessingException { ! Topic player = role.getPlayer(); ! if ((player != null) && player.equals(topic)) { ! addResultsRow(ret, new Object[] {role, topic}); ! } } *************** *** 98,105 **** * @param ret */ ! private void matchRolePlayers(AssociationRole member, VariableSet ret) throws TologProcessingException { ! for (Iterator it = member.getPlayers().iterator(); it.hasNext();) { ! addResultsRow(ret, new Object[] {member, it.next()}); ! } } --- 97,105 ---- * @param ret */ ! private void matchRolePlayers(AssociationRole role, VariableSet ret) throws TologProcessingException { ! Topic player = role.getPlayer(); ! if (player != null) { ! addResultsRow(ret, new Object[] {role, player}); ! } } *************** *** 109,115 **** */ private void matchRolesPlayed(Topic topic, VariableSet ret) throws TologProcessingException { ! for (Iterator it = topic.getRolesPlayed().iterator(); it.hasNext();) { ! addResultsRow(ret, new Object[] {it.next(), topic}); ! } } --- 109,115 ---- */ private void matchRolesPlayed(Topic topic, VariableSet ret) throws TologProcessingException { ! for (Iterator it = topic.getRolesPlayed().iterator(); it.hasNext();) { ! addResultsRow(ret, new Object[] {it.next(), topic}); ! } } Index: ResourcePredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/ResourcePredicate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ResourcePredicate.java 6 Mar 2005 18:14:09 -0000 1.2 --- ResourcePredicate.java 6 Mar 2005 22:36:52 -0000 1.3 *************** *** 8,18 **** import java.util.List; - import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.TologParserException; import org.tmapiutils.query.tolog.TologProcessingException; import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; ! import org.tmapi.core.DataObject; import org.tmapi.core.TopicMap; import org.tmapi.index.core.OccurrencesIndex; --- 8,25 ---- import java.util.List; import org.tmapiutils.query.tolog.TologParserException; import org.tmapiutils.query.tolog.TologProcessingException; import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; ! ! import org.tmapiutils.utils.IndexUtils; ! // TMAPI ! import org.tmapi.core.Locator; ! import org.tmapi.core.TopicMapObject; import org.tmapi.core.TopicMap; + import org.tmapi.core.Occurrence; + import org.tmapi.core.Variant; + import org.tmapi.core.TMAPIException; + import org.tmapi.index.core.VariantsIndex; import org.tmapi.index.core.OccurrencesIndex; *************** *** 30,34 **** }; ! private OccurrencesIndex m_oli; /* (non-Javadoc) --- 37,42 ---- }; ! private OccurrencesIndex _occIdx; ! private VariantsIndex _varIdx; /* (non-Javadoc) *************** *** 54,90 **** VariableSet ret = new VariableSet(); initialiseResultsSet(ret); ! if ((object instanceof DataObject) && (locator instanceof Variable)) { ! DataObject d = (DataObject)object; ! if (d.getResource() != null) { ! addResultsRow(ret, new Object[] {object, d.getResource()}); ! } ! } else if ((object instanceof Variable) && (locator instanceof Locator)) { ! Iterator it = m_oli.getOccurrencesByResource((Locator)locator).iterator(); ! while (it.hasNext()) { ! addResultsRow(ret, new Object[] {it.next(), locator}); ! } ! // TODO: Support Variant lookup ! } else if ((object instanceof Variable) && (locator instanceof Variable)) { ! // TODO: Implement index methods to support this. ! Iterator it = getTopicMap().getObjects().iterator(); ! while (it.hasNext()) { ! Object tmo = it.next(); ! if (tmo instanceof DataObject) { ! DataObject dataObj = (DataObject)tmo; ! Locator l = dataObj.getResource(); ! if (l != null) { ! addResultsRow(ret, new Object[] { dataObj, l }); } } } ! } else if ((object instanceof DataObject) && (locator instanceof Locator)) { ! DataObject d = (DataObject)object; ! if ((d.getResource() != null) && (d.getResource().equals((Locator)locator))) { ! addResultsRow(ret, new Object[] { object, locator }); ! } ! } ! return ret; } /* (non-Javadoc) * @see org.tmapiutils.query.tolog.parser.Predicate#initialise(org.tmapi.core.TopicMap) --- 62,165 ---- VariableSet ret = new VariableSet(); initialiseResultsSet(ret); ! ! if ((object instanceof Occurrence) || (object instanceof Variant)) { ! Locator resource = getResource(object); ! if (locator instanceof Locator) { ! if ((resource != null) && resource.equals(locator)) { ! addResultsRow(ret, new Object[] { object, locator }); ! } ! } ! else { ! // Locator is a variable ! if (resource != null) { ! addResultsRow(ret, new Object[] { object, resource }); ! } ! } ! } ! else if ((object instanceof Variable) && (locator instanceof Locator)) { ! IndexUtils.updateIndex(_occIdx); ! for (Iterator iter = _occIdx.getOccurrencesByResource(locator); iter.hasNext();) { ! addResultsRow(ret, new Object[] {iter.next(), locator}); ! } ! IndexUtils.updateIndex(_varIdx); ! for (Iterator iter = _varIdx.getVariantsByResource(locator); iter.hasNext();) { ! addResultsRow(ret, new Object[] {iter.next(), locator}); ! } ! } ! else if ((object instanceof Variable) && (locator instanceof Variable)) { ! Topic topic; ! Locator resource; ! for (Iterator iter = getTopicMap().getTopics().iterator(); iter.hasNext();) { ! topic = (Topic) iter.next(); ! for (Iterator occIter = topic.getOccurrences().iterator(); occIter.hasNext();) { ! Occurrence occ = (Occurrence) occIter.next(); ! resource = occ.getResource(); ! if (resource != null) { ! addResultsRow(ret, new Object[] {occ, resource}); ! } ! } ! for (Iterator tnIter = topic.getTopicNames().iterator(); tnIter.hasNext();) { ! TopicName tn = (TopicName) tnIter.next(); ! for (Iterator varIter = tn.getVariants().iterator(); varIter.hasNext();) { ! Variant variant = (Variant) varIter.next(); ! resource = variant.getResource(); ! if (resource != null) { ! addResultsRow(ret, new Object[] {variant, resource}); ! } } } } ! } ! return ret; ! ! // if ((object instanceof DataObject) && (locator instanceof Variable)) { ! // DataObject d = (DataObject)object; ! // if (d.getResource() != null) { ! // addResultsRow(ret, new Object[] {object, d.getResource()}); ! // } ! // } else if ((object instanceof Variable) && (locator instanceof Locator)) { ! // Iterator it = m_oli.getOccurrencesByResource((Locator)locator).iterator(); ! // while (it.hasNext()) { ! // addResultsRow(ret, new Object[] {it.next(), locator}); ! // } ! // // TODO: Support Variant lookup ! // } else if ((object instanceof Variable) && (locator instanceof Variable)) { ! // // TODO: Implement index methods to support this. ! // Iterator it = getTopicMap().getObjects().iterator(); ! // while (it.hasNext()) { ! // Object tmo = it.next(); ! // if (tmo instanceof DataObject) { ! // DataObject dataObj = (DataObject)tmo; ! // Locator l = dataObj.getResource(); ! // if (l != null) { ! // addResultsRow(ret, new Object[] { dataObj, l }); ! // } ! // } ! // } ! // } else if ((object instanceof DataObject) && (locator instanceof Locator)) { ! // DataObject d = (DataObject)object; ! // if ((d.getResource() != null) && (d.getResource().equals((Locator)locator))) { ! // addResultsRow(ret, new Object[] { object, locator }); ! // } ! // } ! // return ret; } + /** + * Returns the resource from a variant or occurrence. + * + * @param dataObject Either an Occurrence or a Variant instance + * @return The resource of the object or <code>null</code>. + */ + private Locator getResource(TopicMapObject dataObject) { + if (object instanceof Occurrence) { + return ((Occurrence) object).getResource(); + } + else { + return ((Variant) object).getResource(); + } + } + + /* (non-Javadoc) * @see org.tmapiutils.query.tolog.parser.Predicate#initialise(org.tmapi.core.TopicMap) *************** *** 93,99 **** super.initialise(tm); try { ! m_oli = tm.getIndexManager().getOccurrencesIndex(); ! if (!m_oli.isOpen()) m_oli.open(); ! } catch (Exception ex) { throw new TologParserException("Error initialising index for " + PREDICATE_NAME, ex); } --- 168,174 ---- super.initialise(tm); try { ! _occIdx = (OccurrencesIndex) tm.getHelperObject(OccurrencesIndex.class); ! _varIdx = (VariantsIndex) tm.getHelperObject(VariantsIndex.class); ! } catch (TMAPIException ex) { throw new TologParserException("Error initialising index for " + PREDICATE_NAME, ex); } |
|
From: Lars H. <lh...@us...> - 2005-03-06 21:49:44
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30668/src/org/tmapiutils/query/tolog/predicates Modified Files: ReifiesPredicate.java Log Message: Typo Index: ReifiesPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/ReifiesPredicate.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ReifiesPredicate.java 6 Mar 2005 21:39:42 -0000 1.4 --- ReifiesPredicate.java 6 Mar 2005 21:49:35 -0000 1.5 *************** *** 155,159 **** if (reifier != null) { ! addResultsRow(ret, new Object[] {t, object}); } // Iterator it = object.getSourceLocators().iterator(); --- 155,159 ---- if (reifier != null) { ! addResultsRow(ret, new Object[] {reifier, object}); } // Iterator it = object.getSourceLocators().iterator(); *************** *** 182,185 **** --- 182,188 ---- /* * $Log$ + * Revision 1.5 2005/03/06 21:49:35 lheuer + * Typo + * * Revision 1.4 2005/03/06 21:39:42 lheuer * More TM4J -> TMAPI translations |
|
From: Lars H. <lh...@us...> - 2005-03-06 21:39:56
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27924/src/org/tmapiutils/query/tolog/predicates Modified Files: OccurrencePredicate.java ReifiesPredicate.java Log Message: More TM4J -> TMAPI translations Index: OccurrencePredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/OccurrencePredicate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OccurrencePredicate.java 6 Mar 2005 17:30:00 -0000 1.1 --- OccurrencePredicate.java 6 Mar 2005 21:39:42 -0000 1.2 *************** *** 16,21 **** import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; ! import org.tmapi.core.Occurrence; import org.tmapi.core.Topic; /** --- 16,23 ---- import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; ! // TMAPI import org.tmapi.core.Topic; + import org.tmapi.core.Occurrence; + /** *************** *** 57,65 **** openMatch((Variable)p1, (Variable)p2, ret); } else if ((p1 instanceof Variable) && (p2 instanceof Occurrence)) { ! addResultsRow(ret, new Object[] {((Occurrence)p2).getParent(), p2}); } else if ((p1 instanceof Topic) && (p2 instanceof Variable)) { getOccurrences((Topic)p1, (Variable)p2, ret); } else if ((p1 instanceof Topic) && (p2 instanceof Occurrence)) { ! if (((Occurrence)p2).getParent().equals(p1)) { addResultsRow(ret, new Object[] {p1, p2}); } --- 59,67 ---- openMatch((Variable)p1, (Variable)p2, ret); } else if ((p1 instanceof Variable) && (p2 instanceof Occurrence)) { ! addResultsRow(ret, new Object[] {((Occurrence)p2).getTopic(), p2}); } else if ((p1 instanceof Topic) && (p2 instanceof Variable)) { getOccurrences((Topic)p1, (Variable)p2, ret); } else if ((p1 instanceof Topic) && (p2 instanceof Occurrence)) { ! if (((Occurrence)p2).getTopic().equals(p1)) { addResultsRow(ret, new Object[] {p1, p2}); } *************** *** 98,101 **** --- 100,106 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:39:42 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:30:00 lheuer * Initial tolog import Index: ReifiesPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/ReifiesPredicate.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ReifiesPredicate.java 6 Mar 2005 19:37:23 -0000 1.3 --- ReifiesPredicate.java 6 Mar 2005 21:39:42 -0000 1.4 *************** *** 15,24 **** import java.util.List; - import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.TologProcessingException; import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; ! import org.tmapi.core.Topic; import org.tmapi.core.TopicMapObject; /** --- 15,32 ---- import java.util.List; import org.tmapiutils.query.tolog.TologProcessingException; import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; ! // TMAPI ! import org.tmapi.core.Locator; import org.tmapi.core.TopicMapObject; + import org.tmapi.core.TopicMap; + import org.tmapi.core.Topic; + import org.tmapi.core.Association; + import org.tmapi.core.AssociationRole; + import org.tmapi.core.Occurrence; + import org.tmapi.core.TopicName; + import org.tmapi.core.Variant; + /** *************** *** 77,91 **** */ private void closedMatch(Topic topic, TopicMapObject object, VariableSet ret) throws TologProcessingException { ! Locator l = topic.getSubjectLocators(); ! if (l == null) { ! return; ! } ! Iterator it = object.getSourceLocators().iterator(); ! while (it.hasNext()) { ! if (it.next().equals(l)) { ! addResultsRow(ret, new Object[] {topic, object}); ! return; ! } ! } } --- 85,102 ---- */ private void closedMatch(Topic topic, TopicMapObject object, VariableSet ret) throws TologProcessingException { ! if (topic.getReified().contains(object)) { ! addResultsRow(ret, new Object[] {topic, object}); ! } ! // Locator l = topic.getSubjectLocators(); ! // if (l == null) { ! // return; ! // } ! // Iterator it = object.getSourceLocators().iterator(); ! // while (it.hasNext()) { ! // if (it.next().equals(l)) { ! // addResultsRow(ret, new Object[] {topic, object}); ! // return; ! // } ! // } } *************** *** 94,112 **** */ private void openMatch(VariableSet ret) throws TologProcessingException { ! // TODO Add an accessor method to TopicMap to allow access to all topics with a subject locator ! Iterator it = getTopicMap().getTopics().iterator(); ! while (it.hasNext()) { ! Topic t = (Topic)it.next(); ! Iterator si = t.getSubjectIdentifiers().iterator(); ! while (si.hasNext()) { ! Locator l = (Locator)si.next(); ! if (l != null) { ! TopicMapObject reified = getTopicMap().getObjectBySourceLocator(l); ! if (reified != null) { ! addResultsRow(ret, new Object[] {t, reified}); ! } ! } } ! } } --- 105,130 ---- */ private void openMatch(VariableSet ret) throws TologProcessingException { ! Topic topic; ! for (Iterator iter = getTopicMap().getTopics().iterator(); iter.hasNext();) { ! topic = (Topic) iter.next(); ! for (Iterator reifIter = topic.getReified().iterator(); reifIter.hasNext();) { ! addResultsRow(ret, new Object[] {topic, reifIter.next()}); } ! } ! // // TODO Add an accessor method to TopicMap to allow access to all topics with a subject locator ! // Iterator it = getTopicMap().getTopics().iterator(); ! // while (it.hasNext()) { ! // Topic t = (Topic)it.next(); ! // Iterator si = t.getSubjectIdentifiers().iterator(); ! // while (si.hasNext()) { ! // Locator l = (Locator)si.next(); ! // if (l != null) { ! // TopicMapObject reified = getTopicMap().getObjectBySourceLocator(l); ! // if (reified != null) { ! // addResultsRow(ret, new Object[] {t, reified}); ! // } ! // } ! // } ! // } } *************** *** 116,136 **** */ private void getReifier(TopicMapObject object, VariableSet ret) throws TologProcessingException { ! Iterator it = object.getSourceLocators().iterator(); ! while (it.hasNext()) { ! Topic t = getTopicMap().getTopicBySubjectIndicator((Locator)it.next()); ! if (t != null) { ! addResultsRow(ret, new Object[] {t, object}); ! } ! } } private void getReified(Topic reifier, VariableSet ret) throws TologProcessingException { ! Iterator it = reifier.getSubjectIdentifiers().iterator(); ! while (it.hasNext()) { ! TopicMapObject tmo = getTopicMap().getObjectBySourceLocator((Locator)it.next()); ! if (tmo != null) { ! addResultsRow(ret, new Object[] { reifier, tmo }); ! } } } --- 134,180 ---- */ private void getReifier(TopicMapObject object, VariableSet ret) throws TologProcessingException { ! Topic reifier = null; ! if (object instanceof TopicMap) { ! reifier = ((TopicMap) object).getReifier(); ! } ! else if (object instanceof Association) { ! reifier = ((Association) object).getReifier(); ! } ! else if (object instanceof AssociationRole) { ! reifier = ((AssociationRole) object).getReifier(); ! } ! else if (object instanceof Occurrence) { ! reifier = ((Occurrence) object).getReifier(); ! } ! else if (object instanceof TopicName) { ! reifier = ((TopicName) object).getReifier(); ! } ! else if (object instanceof Variant) { ! reifier = ((Variant) object).getReifier(); ! } ! ! if (reifier != null) { ! addResultsRow(ret, new Object[] {t, object}); ! } ! // Iterator it = object.getSourceLocators().iterator(); ! // while (it.hasNext()) { ! // Topic t = getTopicMap().getTopicBySubjectIndicator((Locator)it.next()); ! // if (t != null) { ! // addResultsRow(ret, new Object[] {t, object}); ! // } ! // } } private void getReified(Topic reifier, VariableSet ret) throws TologProcessingException { ! for (Iterator iter = reifier.getReified().iterator(); iter.hasNext();) { ! addResultsRow(ret, new Object[] { reifier, iter.next()}); } + // Iterator it = reifier.getSubjectIdentifiers().iterator(); + // while (it.hasNext()) { + // TopicMapObject tmo = getTopicMap().getObjectBySourceLocator((Locator)it.next()); + // if (tmo != null) { + // addResultsRow(ret, new Object[] { reifier, tmo }); + // } + // } } *************** *** 138,141 **** --- 182,188 ---- /* * $Log$ + * Revision 1.4 2005/03/06 21:39:42 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.3 2005/03/06 19:37:23 lheuer * Changed getTopicByID to getObjectById |
|
From: Lars H. <lh...@us...> - 2005-03-06 21:39:51
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27924/src/org/tmapiutils/query/tolog Modified Files: todo-log.txt Log Message: More TM4J -> TMAPI translations Index: todo-log.txt =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/todo-log.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** todo-log.txt 6 Mar 2005 21:01:08 -0000 1.2 --- todo-log.txt 6 Mar 2005 21:39:42 -0000 1.3 *************** *** 32,57 **** Should become getHelperObject(IndexInterface.class) - File: query\tolog\predicates\OccurrencePredicate.java - line: 59 - getParent() - Cannot resolve getParent - line: 63 - getParent() - Cannot resolve getParent - - - File: query\tolog\predicates\ReifiesPredicate.java - line: 79 - getSubject() - Replaced just getSubject() -> getSubjectLocators(). ToDo: .iterator().next() or something - line: 104 - getObjectBySourceLocator( - TopicMap.getObjectBySourceLocator -> TopicMapObjectsIndex.getTopicMapObjectBySourceLocator - line: 120 - getTopicBySubjectIndicator( - TopicMap.getTopicBySubjectIndicator -> TopicsIndex.getTopicBySubjectIdentifier - line: 130 - getObjectBySourceLocator( - TopicMap.getObjectBySourceLocator -> TopicMapObjectsIndex.getTopicMapObjectBySourceLocator File: query\tolog\predicates\ResourcePredicate.java --- 32,35 ---- |
|
From: Lars H. <lh...@us...> - 2005-03-06 21:12:15
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20057/src/org/tmapiutils/query/tolog/parser Modified Files: PlayerRoleVarPair.java ProjectionImpl.java TologRuleInstanceImpl.java Log Message: More TM4J -> TMAPI translations Index: ProjectionImpl.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/parser/ProjectionImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProjectionImpl.java 6 Mar 2005 17:29:06 -0000 1.1 --- ProjectionImpl.java 6 Mar 2005 21:11:32 -0000 1.2 *************** *** 152,156 **** Object o = it.next(); if (o instanceof TopicMapObject) { ! m.append(((TopicMapObject)o).getID()); } else { m.append(String.valueOf(o)); --- 152,156 ---- Object o = it.next(); if (o instanceof TopicMapObject) { ! m.append(((TopicMapObject)o).getObjectId()); } else { m.append(String.valueOf(o)); *************** *** 183,186 **** --- 183,189 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:32 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:29:06 lheuer * Initial tolog import Index: PlayerRoleVarPair.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/parser/PlayerRoleVarPair.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlayerRoleVarPair.java 6 Mar 2005 17:29:06 -0000 1.1 --- PlayerRoleVarPair.java 6 Mar 2005 21:11:31 -0000 1.2 *************** *** 92,96 **** if (m_pVar == null) { if (m_pPh == null) { ! sb.append(m_pTopic.getID()); } else { sb.append(m_pPh.toString()); --- 92,96 ---- if (m_pVar == null) { if (m_pPh == null) { ! sb.append(m_pTopic.getObjectId()); } else { sb.append(m_pPh.toString()); *************** *** 102,106 **** if (m_rTopic != null) { sb.append(":"); ! sb.append(m_rTopic.getID()); } else if (m_rVar != null) { sb.append(":"); --- 102,106 ---- if (m_rTopic != null) { sb.append(":"); ! sb.append(m_rTopic.getObjectId()); } else if (m_rVar != null) { sb.append(":"); *************** *** 117,120 **** --- 117,123 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:31 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:29:06 lheuer * Initial tolog import Index: TologRuleInstanceImpl.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/parser/TologRuleInstanceImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TologRuleInstanceImpl.java 6 Mar 2005 17:29:07 -0000 1.1 --- TologRuleInstanceImpl.java 6 Mar 2005 21:11:32 -0000 1.2 *************** *** 276,280 **** val = getParameterValue(params, v); ret.addColumn(v); ! if (m_log.isDebugEnabled()) m_log.debug("Rule variable " + headVar.toString() + " maps to query variable " + ((val instanceof Topic) ? ((Topic)val).getID() : val.toString())); m_bodyParamMap.put(headVar, v); } --- 276,280 ---- val = getParameterValue(params, v); ret.addColumn(v); ! if (m_log.isDebugEnabled()) m_log.debug("Rule variable " + headVar.toString() + " maps to query variable " + ((val instanceof Topic) ? ((Topic)val).getObjectId() : val.toString())); m_bodyParamMap.put(headVar, v); } *************** *** 374,378 **** Object o = it.next(); if (o instanceof TopicMapObject) { ! buff.append(((TopicMapObject)o).getID()); } else { buff.append(o.toString()); --- 374,378 ---- Object o = it.next(); if (o instanceof TopicMapObject) { ! buff.append(((TopicMapObject)o).getObjectId()); } else { buff.append(o.toString()); *************** *** 389,392 **** --- 389,395 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:32 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:29:07 lheuer * Initial tolog import |
|
From: Lars H. <lh...@us...> - 2005-03-06 21:12:15
|
Update of /cvsroot/tmapi-utils/tmapi-utils/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20432/utils Modified Files: terminology.py Log Message: More translations added Index: terminology.py =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/utils/terminology.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** terminology.py 6 Mar 2005 20:41:05 -0000 1.7 --- terminology.py 6 Mar 2005 21:12:03 -0000 1.8 *************** *** 29,32 **** --- 29,33 ---- 'AssociationRoleTypesIndex':'AssociationRolesIndex', # if Member -> AssociationRole replacement 'TopicTypesIndex':'TopicsIndex', + 'AssociationTypesIndex':'AssociationsIndex', # AssociationRole 'Member':'AssociationRole', *************** *** 48,51 **** --- 49,53 ---- 'getAssociationsIterator()':'getAssociations().iterator()', 'getTopicByID(':'getObjectById(', + 'getObjectByID(':'getObjectById(', # Topic 'getNames()':'getTopicNames()', *************** *** 79,82 **** --- 81,85 ---- 'getMemberTypes()':'getAssociationRoleTypes()', 'getMembersOfType(':'getAssociationRolesByType(', + 'getAssociationRolesOfType(':'getAssociationRolesByType(', # if Member -> AssociationRole # OccurrencesIndex 'getOccurrencesOfType(':'getOccurrencesByType(', *************** *** 103,106 **** --- 106,110 ---- 'Lucene':'Fulltext index not available', 'SerializedTopicMap':'No equivalent', + 'AssociationExtractor':'No equivalent', # Topic 'getSubject()':'Replaced just getSubject() -> getSubjectLocators(). ToDo: .iterator().next() or something', |
|
From: Lars H. <lh...@us...> - 2005-03-06 21:12:15
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20057/src/org/tmapiutils/query/tolog Modified Files: TologFragmentBuilderImpl.java Log Message: More TM4J -> TMAPI translations Index: TologFragmentBuilderImpl.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/TologFragmentBuilderImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TologFragmentBuilderImpl.java 6 Mar 2005 17:27:33 -0000 1.1 --- TologFragmentBuilderImpl.java 6 Mar 2005 21:11:31 -0000 1.2 *************** *** 11,17 **** package org.tmapiutils.query.tolog; ! import org.tm4j.net.Locator; ! import org.tm4j.net.LocatorFactory; ! import org.tm4j.net.LocatorFactoryException; import org.tmapi.core.Association; --- 11,17 ---- package org.tmapiutils.query.tolog; ! import org.tmapi.core.Locator; ! import org.tmapi.core.LocatorFactory; ! import org.tmapi.core.LocatorFactoryException; import org.tmapi.core.Association; *************** *** 113,117 **** Locator ratLoc = locFactory.createLocator("URI", ROW_ASSOC_TYPE_SUBJECT_INDICATOR); ! m_rowAssocType = m_frag.getTopicMap().createTopic(m_idgen.getID()); m_rowAssocType.addSubjectIdentifier(ratLoc); --- 113,117 ---- Locator ratLoc = locFactory.createLocator("URI", ROW_ASSOC_TYPE_SUBJECT_INDICATOR); ! m_rowAssocType = m_frag.getTopicMap().createTopic(m_idgen.getObjectId()); m_rowAssocType.addSubjectIdentifier(ratLoc); *************** *** 142,146 **** for (int i = 0; i < rs.getNumCols(); i++) { String colName = rs.getVar(i); ! Topic t = fragTM.createTopic(m_idgen.getID()); if (m_genVarTopicSI) { --- 142,146 ---- for (int i = 0; i < rs.getNumCols(); i++) { String colName = rs.getVar(i); ! Topic t = fragTM.createTopic(m_idgen.getObjectId()); if (m_genVarTopicSI) { *************** *** 178,187 **** Topic src = (Topic) row.get(i); ! if (m_frag.getTopicMap().getObjectByID(src.getID()) == null) { Topic cp = m_frag.addTopic((Topic) row.get(i), 0); copiedRow.add(cp); } else { copiedRow.add((Topic) m_frag.getTopicMap() ! .getObjectByID(src.getID())); } } else { --- 178,187 ---- Topic src = (Topic) row.get(i); ! if (m_frag.getTopicMap().getObjectById(src.getObjectId()) == null) { Topic cp = m_frag.addTopic((Topic) row.get(i), 0); copiedRow.add(cp); } else { copiedRow.add((Topic) m_frag.getTopicMap() ! .getObjectById(src.getObjectId())); } } else { *************** *** 228,231 **** --- 228,234 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:31 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:27:33 lheuer * Initial tolog import |
|
From: Lars H. <lh...@us...> - 2005-03-06 21:11:46
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20057/src/org/tmapiutils/query/tolog/test Modified Files: AssociationPredicateTest.java MemoryQueryEvaluatorImplTest.java ProjectionTest.java SortingTest.java TologParserTest.java TologParserTestBase.java Log Message: More TM4J -> TMAPI translations Index: AssociationPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/test/AssociationPredicateTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AssociationPredicateTest.java 6 Mar 2005 17:34:06 -0000 1.1 --- AssociationPredicateTest.java 6 Mar 2005 21:11:33 -0000 1.2 *************** *** 18,22 **** import org.apache.log4j.BasicConfigurator; ! import org.tm4j.net.Locator; import org.tmapiutils.query.tolog.parser.ClauseList; import org.tmapiutils.query.tolog.parser.PlayerRoleVarPair; --- 18,22 ---- import org.apache.log4j.BasicConfigurator; ! import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.parser.ClauseList; import org.tmapiutils.query.tolog.parser.PlayerRoleVarPair; *************** *** 60,66 **** DynamicAssociationPredicate p = new DynamicAssociationPredicate(); ArrayList params = new ArrayList(); ! params.add(m_tm.getTopicByID("worksfor")); ! params.add(new PlayerRoleVarPair(m_tm.getTopicByID("kal"), m_tm.getTopicByID("employee"))); ! params.add(new PlayerRoleVarPair(new Variable("A"), m_tm.getTopicByID("employer"))); p.setParameters(params); c.addPredicate(p); --- 60,66 ---- DynamicAssociationPredicate p = new DynamicAssociationPredicate(); ArrayList params = new ArrayList(); ! params.add(m_tm.getObjectById("worksfor")); ! params.add(new PlayerRoleVarPair(m_tm.getObjectById("kal"), m_tm.getObjectById("employee"))); ! params.add(new PlayerRoleVarPair(new Variable("A"), m_tm.getObjectById("employer"))); p.setParameters(params); c.addPredicate(p); *************** *** 73,77 **** assertNotNull(row); assertEquals(row.size(), 1); ! assertEquals(m_tm.getTopicByID("techquila"), row.get(0)); } --- 73,77 ---- assertNotNull(row); assertEquals(row.size(), 1); ! assertEquals(m_tm.getObjectById("techquila"), row.get(0)); } *************** *** 83,89 **** p.initialise(m_tm); ArrayList params = new ArrayList(); ! params.add(m_tm.getTopicByID("worksfor")); ! params.add(new PlayerRoleVarPair(new Variable("PERSON"), m_tm.getTopicByID("employee"))); ! params.add(new PlayerRoleVarPair(new Variable("COMPANY"), m_tm.getTopicByID("employer"))); p.setParameters(params); c.addPredicate(p); --- 83,89 ---- p.initialise(m_tm); ArrayList params = new ArrayList(); ! params.add(m_tm.getObjectById("worksfor")); ! params.add(new PlayerRoleVarPair(new Variable("PERSON"), m_tm.getObjectById("employee"))); ! params.add(new PlayerRoleVarPair(new Variable("COMPANY"), m_tm.getObjectById("employer"))); p.setParameters(params); c.addPredicate(p); *************** *** 99,107 **** assertEquals(row.size(), 2); assertTrue( ! row.get(0).equals(m_tm.getTopicByID("kal")) || ! row.get(0).equals(m_tm.getTopicByID("fred"))); assertTrue( ! row.get(1).equals(m_tm.getTopicByID("techquila")) || ! row.get(1).equals(m_tm.getTopicByID("bigcorp"))); } } --- 99,107 ---- assertEquals(row.size(), 2); assertTrue( ! row.get(0).equals(m_tm.getObjectById("kal")) || ! row.get(0).equals(m_tm.getObjectById("fred"))); assertTrue( ! row.get(1).equals(m_tm.getObjectById("techquila")) || ! row.get(1).equals(m_tm.getObjectById("bigcorp"))); } } *************** *** 113,118 **** ArrayList params = new ArrayList(); params.add(new Variable("ASSOC")); ! params.add(new PlayerRoleVarPair(new Variable("PERSON"), m_tm.getTopicByID("employee"))); ! params.add(new PlayerRoleVarPair(new Variable("COMPANY"), m_tm.getTopicByID("employer"))); p.setParameters(params); c.addPredicate(p); --- 113,118 ---- ArrayList params = new ArrayList(); params.add(new Variable("ASSOC")); ! params.add(new PlayerRoleVarPair(new Variable("PERSON"), m_tm.getObjectById("employee"))); ! params.add(new PlayerRoleVarPair(new Variable("COMPANY"), m_tm.getObjectById("employer"))); p.setParameters(params); c.addPredicate(p); *************** *** 128,138 **** assertNotNull(row); assertEquals(row.size(), 3); ! assertEquals(row.get(0), m_tm.getTopicByID("worksfor")); assertTrue( ! row.get(1).equals(m_tm.getTopicByID("kal")) || ! row.get(1).equals(m_tm.getTopicByID("fred"))); assertTrue( ! row.get(2).equals(m_tm.getTopicByID("techquila")) || ! row.get(2).equals(m_tm.getTopicByID("bigcorp"))); } } --- 128,138 ---- assertNotNull(row); assertEquals(row.size(), 3); ! assertEquals(row.get(0), m_tm.getObjectById("worksfor")); assertTrue( ! row.get(1).equals(m_tm.getObjectById("kal")) || ! row.get(1).equals(m_tm.getObjectById("fred"))); assertTrue( ! row.get(2).equals(m_tm.getObjectById("techquila")) || ! row.get(2).equals(m_tm.getObjectById("bigcorp"))); } } *************** *** 147,151 **** SerializedTopicMapSource src = new SerializedTopicMapSource(new StringReader(TESTMAP), loc, new LTMBuilder()); m_tm = m_provider.addTopicMap(src); ! assertNotNull(m_tm.getTopicByID("worksfor")); } --- 147,151 ---- SerializedTopicMapSource src = new SerializedTopicMapSource(new StringReader(TESTMAP), loc, new LTMBuilder()); m_tm = m_provider.addTopicMap(src); ! assertNotNull(m_tm.getObjectById("worksfor")); } *************** *** 156,159 **** --- 156,162 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:33 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:34:06 lheuer * Initial tolog import Index: SortingTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/test/SortingTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SortingTest.java 6 Mar 2005 17:34:06 -0000 1.1 --- SortingTest.java 6 Mar 2005 21:11:34 -0000 1.2 *************** *** 15,19 **** import junit.framework.TestCase; ! import org.tm4j.net.Locator; import org.tmapiutils.query.tolog.parser.Sorting; import org.tmapiutils.query.tolog.parser.Variable; --- 15,19 ---- import junit.framework.TestCase; ! import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.parser.Sorting; import org.tmapiutils.query.tolog.parser.Variable; *************** *** 158,162 **** private TopicMap newTopicMap() throws Exception { ! Locator loc = m_provider.getLocatorFactory().createLocator("URI", "http://www.tm4j.org/tests/" + m_idgen.getID()); return m_provider.createTopicMap(loc); } --- 158,162 ---- private TopicMap newTopicMap() throws Exception { ! Locator loc = m_provider.getLocatorFactory().createLocator("URI", "http://www.tm4j.org/tests/" + m_idgen.getObjectId()); return m_provider.createTopicMap(loc); } *************** *** 166,169 **** --- 166,172 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:34 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:34:06 lheuer * Initial tolog import Index: ProjectionTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/test/ProjectionTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProjectionTest.java 6 Mar 2005 17:34:06 -0000 1.1 --- ProjectionTest.java 6 Mar 2005 21:11:34 -0000 1.2 *************** *** 18,22 **** import junit.framework.TestCase; ! import org.tm4j.net.Locator; import org.tmapiutils.query.tolog.parser.ClauseList; import org.tmapiutils.query.tolog.parser.PlayerRoleVarPair; --- 18,22 ---- import junit.framework.TestCase; ! import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.parser.ClauseList; import org.tmapiutils.query.tolog.parser.PlayerRoleVarPair; *************** *** 61,67 **** DynamicAssociationPredicate p = new DynamicAssociationPredicate(); ArrayList params = new ArrayList(); ! params.add(m_tm.getTopicByID("contains")); ! params.add(new PlayerRoleVarPair(new Variable("CONTAINER"), m_tm.getTopicByID("container"))); ! params.add(new PlayerRoleVarPair(new Variable("CONTAINEE"), m_tm.getTopicByID("containee"))); p.setParameters(params); p.initialise(m_tm); --- 61,67 ---- DynamicAssociationPredicate p = new DynamicAssociationPredicate(); ArrayList params = new ArrayList(); ! params.add(m_tm.getObjectById("contains")); ! params.add(new PlayerRoleVarPair(new Variable("CONTAINER"), m_tm.getObjectById("container"))); ! params.add(new PlayerRoleVarPair(new Variable("CONTAINEE"), m_tm.getObjectById("containee"))); p.setParameters(params); p.initialise(m_tm); *************** *** 88,94 **** assertTrue(row.get(0) instanceof Topic); assertTrue(row.get(1) instanceof Integer); ! if (row.get(0).equals(m_tm.getTopicByID("europe"))) { assertEquals(new Integer(3), row.get(1)); ! } else if (row.get(0).equals(m_tm.getTopicByID("asia"))) { assertEquals(new Integer(2), row.get(1)); } --- 88,94 ---- assertTrue(row.get(0) instanceof Topic); assertTrue(row.get(1) instanceof Integer); ! if (row.get(0).equals(m_tm.getObjectById("europe"))) { assertEquals(new Integer(3), row.get(1)); ! } else if (row.get(0).equals(m_tm.getObjectById("asia"))) { assertEquals(new Integer(2), row.get(1)); } *************** *** 119,122 **** --- 119,125 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:34 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:34:06 lheuer * Initial tolog import Index: MemoryQueryEvaluatorImplTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/test/MemoryQueryEvaluatorImplTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MemoryQueryEvaluatorImplTest.java 6 Mar 2005 17:34:06 -0000 1.1 --- MemoryQueryEvaluatorImplTest.java 6 Mar 2005 21:11:34 -0000 1.2 *************** *** 18,22 **** import junit.framework.TestCase; ! import org.tm4j.net.Locator; import org.tmapiutils.query.tolog.TologResultsSet; import org.tmapiutils.query.tolog.QueryEvaluator; --- 18,22 ---- import junit.framework.TestCase; ! import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.TologResultsSet; import org.tmapiutils.query.tolog.QueryEvaluator; *************** *** 148,152 **** assertEquals(3, results.getNumRows()); Object[][] expectedResults = new Object [][] { ! new Object[] { tm.getObjectByID("redblock"), tm.getObjectByID("blueblock") } }; checkResultsSet("simpleQuery", results, 2, 3, expectedResults); --- 148,152 ---- assertEquals(3, results.getNumRows()); Object[][] expectedResults = new Object [][] { ! new Object[] { tm.getObjectById("redblock"), tm.getObjectById("blueblock") } }; checkResultsSet("simpleQuery", results, 2, 3, expectedResults); *************** *** 162,166 **** for (int k = 0; k < expectedRow.length; k++) { if (expectedRow[k] instanceof TopicRef) { ! expectedRow[k] = tm.getObjectByID(((TopicRef)expectedRow[k]).id); } } --- 162,166 ---- for (int k = 0; k < expectedRow.length; k++) { if (expectedRow[k] instanceof TopicRef) { ! expectedRow[k] = tm.getObjectById(((TopicRef)expectedRow[k]).id); } } *************** *** 186,191 **** public void testInlineModule() throws Exception { TopicMap tm = getTopicMap(new File(m_tologTestDir, "blocks.ltm"), false); ! Topic greenblock = tm.getTopicByID("greenblock"); ! Topic blueblock = tm.getTopicByID("blueblock"); assertNotNull(tm); QueryEvaluator qe = QueryEvaluatorFactory.newQueryEvaluator(tm); --- 186,191 ---- public void testInlineModule() throws Exception { TopicMap tm = getTopicMap(new File(m_tologTestDir, "blocks.ltm"), false); ! Topic greenblock = tm.getObjectById("greenblock"); ! Topic blueblock = tm.getObjectById("blueblock"); assertNotNull(tm); QueryEvaluator qe = QueryEvaluatorFactory.newQueryEvaluator(tm); *************** *** 203,208 **** public void testExternalModule() throws Exception { TopicMap tm = getTopicMap(new File(m_tologTestDir, "blocks.ltm"), false); ! Topic greenblock = tm.getTopicByID("greenblock"); ! Topic blueblock = tm.getTopicByID("blueblock"); QueryEvaluator qe = QueryEvaluatorFactory.newQueryEvaluator(tm); qe.addRulesModule(new FileInputStream(new File(m_tologTestDir, "blocks.tl")), "blocks"); --- 203,208 ---- public void testExternalModule() throws Exception { TopicMap tm = getTopicMap(new File(m_tologTestDir, "blocks.ltm"), false); ! Topic greenblock = tm.getObjectById("greenblock"); ! Topic blueblock = tm.getObjectById("blueblock"); QueryEvaluator qe = QueryEvaluatorFactory.newQueryEvaluator(tm); qe.addRulesModule(new FileInputStream(new File(m_tologTestDir, "blocks.tl")), "blocks"); *************** *** 223,233 **** TologResultsSet rs = qe.execute("descendant-of(bart, $WHO) ?"); assertEquals(3, rs.getNumRows()); ! Topic homer = tm.getTopicByID("homer"); ! Topic marge = tm.getTopicByID("marge"); ! Topic granpa = tm.getTopicByID("granpa"); for (int i =0 ; i <3; i++) { List row = rs.getRow(i); Topic t = (Topic)row.get(0); ! System.out.println(t.getID()); assertTrue(row.contains(homer) || row.contains(marge) || row.contains(granpa)); } --- 223,233 ---- TologResultsSet rs = qe.execute("descendant-of(bart, $WHO) ?"); assertEquals(3, rs.getNumRows()); ! Topic homer = tm.getObjectById("homer"); ! Topic marge = tm.getObjectById("marge"); ! Topic granpa = tm.getObjectById("granpa"); for (int i =0 ; i <3; i++) { List row = rs.getRow(i); Topic t = (Topic)row.get(0); ! System.out.println(t.getObjectId()); assertTrue(row.contains(homer) || row.contains(marge) || row.contains(granpa)); } *************** *** 246,252 **** TopicMap tm = getTopicMap(new File(m_tologTestDir, "blocks.ltm"), false); QueryEvaluator qe = QueryEvaluatorFactory.newQueryEvaluator(tm); ! TologResultsSet rst = qe.execute("select $A from restson($A:upper, %1:lower)?", new Object[] { tm.getTopicByID("redblock")}); assertEquals(1, rst.getNumRows()); ! assertEquals(tm.getTopicByID("yellowblock"), rst.getRow(0).get(0)); } --- 246,252 ---- TopicMap tm = getTopicMap(new File(m_tologTestDir, "blocks.ltm"), false); QueryEvaluator qe = QueryEvaluatorFactory.newQueryEvaluator(tm); ! TologResultsSet rst = qe.execute("select $A from restson($A:upper, %1:lower)?", new Object[] { tm.getObjectById("redblock")}); assertEquals(1, rst.getNumRows()); ! assertEquals(tm.getObjectById("yellowblock"), rst.getRow(0).get(0)); } *************** *** 271,275 **** Object o = it.next(); if (o instanceof TopicMapObject) { ! ret.append(((TopicMapObject)o).getID()); } else { ret.append(o.toString()); --- 271,275 ---- Object o = it.next(); if (o instanceof TopicMapObject) { ! ret.append(((TopicMapObject)o).getObjectId()); } else { ret.append(o.toString()); *************** *** 319,322 **** --- 319,325 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:34 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:34:06 lheuer * Initial tolog import Index: TologParserTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/test/TologParserTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TologParserTest.java 6 Mar 2005 17:34:06 -0000 1.1 --- TologParserTest.java 6 Mar 2005 21:11:34 -0000 1.2 *************** *** 249,253 **** TopicMap tm = createTopicMap(); Topic tm4jorg = tm.createTopic(null); ! String id = tm4jorg.getID(); Topic tm4j = tm.createTopic("tm4j"); Topic respfor = tm.createTopic("responsiblefor"); --- 249,253 ---- TopicMap tm = createTopicMap(); Topic tm4jorg = tm.createTopic(null); ! String id = tm4jorg.getObjectId(); Topic tm4j = tm.createTopic("tm4j"); Topic respfor = tm.createTopic("responsiblefor"); *************** *** 312,315 **** --- 312,318 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:34 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:34:06 lheuer * Initial tolog import Index: TologParserTestBase.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/test/TologParserTestBase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TologParserTestBase.java 6 Mar 2005 17:34:06 -0000 1.1 --- TologParserTestBase.java 6 Mar 2005 21:11:34 -0000 1.2 *************** *** 12,16 **** import java.io.StringReader; ! import org.tm4j.net.Locator; import org.tmapi.core.TopicMap; import org.tmapi.core.TopicMapProvider; --- 12,16 ---- import java.io.StringReader; ! import org.tmapi.core.Locator; import org.tmapi.core.TopicMap; import org.tmapi.core.TopicMapProvider; *************** *** 70,74 **** public TopicMap getTopicMapFromLTMString(String str) throws Exception { ! Locator l = m_provider.getLocatorFactory().createLocator("URI", "http://www.tm4j.org/tests/" + m_idGen.getID()); SerializedTopicMapSource src = new SerializedTopicMapSource(new StringReader(str), l, new LTMBuilder()); return m_provider.addTopicMap(src); --- 70,74 ---- public TopicMap getTopicMapFromLTMString(String str) throws Exception { ! Locator l = m_provider.getLocatorFactory().createLocator("URI", "http://www.tm4j.org/tests/" + m_idGen.getObjectId()); SerializedTopicMapSource src = new SerializedTopicMapSource(new StringReader(str), l, new LTMBuilder()); return m_provider.addTopicMap(src); *************** *** 76,80 **** public TopicMap createTopicMap() throws Exception { ! Locator l = m_provider.getLocatorFactory().createLocator("URI", "http://www.tm4j.org/tests/" + m_idGen.getID()); return m_provider.createTopicMap(l); } --- 76,80 ---- public TopicMap createTopicMap() throws Exception { ! Locator l = m_provider.getLocatorFactory().createLocator("URI", "http://www.tm4j.org/tests/" + m_idGen.getObjectId()); return m_provider.createTopicMap(l); } *************** *** 82,85 **** --- 82,88 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:34 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:34:06 lheuer * Initial tolog import |
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20057/src/org/tmapiutils/query/tolog/predicates/test Modified Files: DirectInstanceOfPredicateTest.java InstanceOfPredicateTest.java OccurrencePredicateTest.java ReifiesPredicateTest.java Log Message: More TM4J -> TMAPI translations Index: ReifiesPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/ReifiesPredicateTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReifiesPredicateTest.java 6 Mar 2005 17:33:23 -0000 1.1 --- ReifiesPredicateTest.java 6 Mar 2005 21:11:33 -0000 1.2 *************** *** 55,59 **** Variable a = new Variable("A"); params.add(a); ! params.add(m_tm.getObjectByID("assoc1")); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); --- 55,59 ---- Variable a = new Variable("A"); params.add(a); ! params.add(m_tm.getObjectById("assoc1")); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); *************** *** 61,65 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).contains(m_tm.getObjectByID("fredemp"))); } --- 61,65 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).contains(m_tm.getObjectById("fredemp"))); } *************** *** 67,71 **** ArrayList params = new ArrayList(); Variable a = new Variable("A"); ! params.add(m_tm.getObjectByID("fredemp")); params.add(a); m_predicate.setParameters(params); --- 67,71 ---- ArrayList params = new ArrayList(); Variable a = new Variable("A"); ! params.add(m_tm.getObjectById("fredemp")); params.add(a); m_predicate.setParameters(params); *************** *** 74,78 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).contains(m_tm.getObjectByID("assoc1"))); } --- 74,78 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).contains(m_tm.getObjectById("assoc1"))); } *************** *** 88,93 **** assertEquals(2, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).get(0).equals(m_tm.getObjectByID("fredemp"))); ! assertTrue(out.getRow(0).get(1).equals(m_tm.getObjectByID("assoc1"))); } --- 88,93 ---- assertEquals(2, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getRow(0).get(0).equals(m_tm.getObjectById("fredemp"))); ! assertTrue(out.getRow(0).get(1).equals(m_tm.getObjectById("assoc1"))); } *************** *** 99,104 **** params.add(b); m_predicate.setParameters(params); ! params.set(0, m_tm.getObjectByID("fredemp")); ! params.set(1, m_tm.getObjectByID("assoc1")); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); --- 99,104 ---- params.add(b); m_predicate.setParameters(params); ! params.set(0, m_tm.getObjectById("fredemp")); ! params.set(1, m_tm.getObjectById("assoc1")); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 106,111 **** assertEquals(1, out.getRows().size()); ! params.set(0, m_tm.getObjectByID("fredemp")); ! params.set(1, m_tm.getObjectByID("m1")); out = m_predicate.matches(params, m_context); assertNotNull(out); --- 106,111 ---- assertEquals(1, out.getRows().size()); ! params.set(0, m_tm.getObjectById("fredemp")); ! params.set(1, m_tm.getObjectById("m1")); out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 117,120 **** --- 117,123 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:33 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:33:23 lheuer * Initial tolog import Index: DirectInstanceOfPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/DirectInstanceOfPredicateTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DirectInstanceOfPredicateTest.java 6 Mar 2005 19:37:23 -0000 1.3 --- DirectInstanceOfPredicateTest.java 6 Mar 2005 21:11:33 -0000 1.4 *************** *** 60,69 **** assertEquals(2, out.getColumns().size()); assertEquals(5, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("digestive"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("battenburg"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("custardcream"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("jaffacake"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectByID("biscuit"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectByID("cake"))); } --- 60,69 ---- assertEquals(2, out.getColumns().size()); assertEquals(5, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("digestive"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("battenburg"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("custardcream"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("jaffacake"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectById("biscuit"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectById("cake"))); } *************** *** 79,84 **** assertEquals(1, out.getColumns().size()); assertEquals(2, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("battenburg"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("jaffacake"))); } --- 79,84 ---- assertEquals(1, out.getColumns().size()); assertEquals(2, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("battenburg"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("jaffacake"))); } *************** *** 93,98 **** assertEquals(1, out.getColumns().size()); assertEquals(2, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("cake"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("biscuit"))); } --- 93,98 ---- assertEquals(1, out.getColumns().size()); assertEquals(2, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("cake"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("biscuit"))); } *************** *** 108,112 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("jaffacake"))); } --- 108,112 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("jaffacake"))); } Index: OccurrencePredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/OccurrencePredicateTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OccurrencePredicateTest.java 6 Mar 2005 19:37:23 -0000 1.2 --- OccurrencePredicateTest.java 6 Mar 2005 21:11:33 -0000 1.3 *************** *** 72,77 **** assertEquals(2, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("techquila"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("tm4j"))); Iterator it = ((Topic) m_tm.getObjectById("techquila")).getOccurrences().iterator(); while (it.hasNext()) { --- 72,77 ---- assertEquals(2, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("techquila"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("tm4j"))); Iterator it = ((Topic) m_tm.getObjectById("techquila")).getOccurrences().iterator(); while (it.hasNext()) { *************** *** 134,137 **** --- 134,140 ---- /* * $Log$ + * Revision 1.3 2005/03/06 21:11:33 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.2 2005/03/06 19:37:23 lheuer * Changed getTopicByID to getObjectById Index: InstanceOfPredicateTest.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/test/InstanceOfPredicateTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** InstanceOfPredicateTest.java 6 Mar 2005 19:37:23 -0000 1.2 --- InstanceOfPredicateTest.java 6 Mar 2005 21:11:33 -0000 1.3 *************** *** 54,58 **** ArrayList params = new ArrayList(); Variable a = new Variable("A"); ! params.add(m_tm.getObjectByID("nelly")); params.add(a); m_predicate.setParameters(params); --- 54,58 ---- ArrayList params = new ArrayList(); Variable a = new Variable("A"); ! params.add(m_tm.getObjectById("nelly")); params.add(a); m_predicate.setParameters(params); *************** *** 61,67 **** assertEquals(1, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("elephant"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("mammal"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("animal"))); } --- 61,67 ---- assertEquals(1, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("elephant"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("mammal"))); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("animal"))); } *************** *** 70,74 **** Variable a = new Variable("A"); params.add(a); ! params.add(m_tm.getObjectByID("animal")); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); --- 70,74 ---- Variable a = new Variable("A"); params.add(a); ! params.add(m_tm.getObjectById("animal")); m_predicate.setParameters(params); VariableSet out = m_predicate.matches(params, m_context); *************** *** 76,80 **** assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("nelly"))); } --- 76,80 ---- assertEquals(1, out.getColumns().size()); assertEquals(1, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("nelly"))); } *************** *** 90,97 **** assertEquals(2, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectByID("nelly"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectByID("elephant"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectByID("mammal"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectByID("animal"))); } --- 90,97 ---- assertEquals(2, out.getColumns().size()); assertEquals(3, out.getRows().size()); ! assertTrue(out.getColumn(a).contains(m_tm.getObjectById("nelly"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectById("elephant"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectById("mammal"))); ! assertTrue(out.getColumn(b).contains(m_tm.getObjectById("animal"))); } *************** *** 104,108 **** m_predicate.setParameters(params); params.set(0, m_tm.getObjectById("nelly")); ! params.set(1, m_tm.getObjectByID("mammal")); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); --- 104,108 ---- m_predicate.setParameters(params); params.set(0, m_tm.getObjectById("nelly")); ! params.set(1, m_tm.getObjectById("mammal")); VariableSet out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 110,114 **** params.set(0, m_tm.getObjectById("nelly")); ! params.set(1, m_tm.getObjectByID("reptile")); out = m_predicate.matches(params, m_context); assertNotNull(out); --- 110,114 ---- params.set(0, m_tm.getObjectById("nelly")); ! params.set(1, m_tm.getObjectById("reptile")); out = m_predicate.matches(params, m_context); assertNotNull(out); *************** *** 120,123 **** --- 120,126 ---- /* * $Log$ + * Revision 1.3 2005/03/06 21:11:33 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.2 2005/03/06 19:37:23 lheuer * Changed getTopicByID to getObjectById |
