Menu
▾
▴
[Tmapi-utils-commits] tmapi-utils/src/org/tmapiutils/query/tolog/predicates AssociationRolePredicate.java,1.2,1.3 ResourcePredicate.java,1.3,1.4 TopicMapPredicate.java,1.1,1.2 TypePredicate.java,1.2,1.3 ValuePredicate.java,1.1,1.2 VariantPredicate.java,1.1,1.2
|
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); } } |
