Return-Path: X-Original-To: apmail-ctakes-commits-archive@www.apache.org Delivered-To: apmail-ctakes-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D0E231063B for ; Thu, 20 Mar 2014 18:41:06 +0000 (UTC) Received: (qmail 80014 invoked by uid 500); 20 Mar 2014 18:41:06 -0000 Delivered-To: apmail-ctakes-commits-archive@ctakes.apache.org Received: (qmail 79985 invoked by uid 500); 20 Mar 2014 18:41:05 -0000 Mailing-List: contact commits-help@ctakes.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ctakes.apache.org Delivered-To: mailing list commits@ctakes.apache.org Received: (qmail 79969 invoked by uid 99); 20 Mar 2014 18:41:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Mar 2014 18:41:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Mar 2014 18:41:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DE57B23889CB; Thu, 20 Mar 2014 18:40:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1579707 - /ctakes/trunk/ctakes-template-filler/src/main/java/org/apache/ctakes/template/filler/ae/TemplateFillerAnnotator.java Date: Thu, 20 Mar 2014 18:40:39 -0000 To: commits@ctakes.apache.org From: james-masanz@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140320184039.DE57B23889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: james-masanz Date: Thu Mar 20 18:40:39 2014 New Revision: 1579707 URL: http://svn.apache.org/r1579707 Log: more of fix for CTAKES-288 - index name change - creation of text relation annotations has degree_of and location_of separated into two indexes, no longer just one with BinaryTextRelation in the name Modified: ctakes/trunk/ctakes-template-filler/src/main/java/org/apache/ctakes/template/filler/ae/TemplateFillerAnnotator.java Modified: ctakes/trunk/ctakes-template-filler/src/main/java/org/apache/ctakes/template/filler/ae/TemplateFillerAnnotator.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-template-filler/src/main/java/org/apache/ctakes/template/filler/ae/TemplateFillerAnnotator.java?rev=1579707&r1=1579706&r2=1579707&view=diff ============================================================================== --- ctakes/trunk/ctakes-template-filler/src/main/java/org/apache/ctakes/template/filler/ae/TemplateFillerAnnotator.java (original) +++ ctakes/trunk/ctakes-template-filler/src/main/java/org/apache/ctakes/template/filler/ae/TemplateFillerAnnotator.java Thu Mar 20 18:40:39 2014 @@ -219,12 +219,14 @@ public class TemplateFillerAnnotator ext // Fill in template slots from relations. //FSIndex relationArgs = jcas.getFSIndexRepository().getIndex("_org.apache.ctakes.typesystem.type.relation.RelationArgument_GeneratedIndex"); - FSIndex binaryTextRelations = jcas.getFSIndexRepository().getIndex("_org.apache.ctakes.typesystem.type.relation.BinaryTextRelation_GeneratedIndex"); + //FSIndex binaryTextRelations = jcas.getFSIndexRepository().getIndex("_org.apache.ctakes.typesystem.type.relation.BinaryTextRelation_GeneratedIndex"); + FSIndex locationOfTextRelations = jcas.getFSIndexRepository().getIndex("_org.apache.ctakes.typesystem.type.relation.LocationOfTextRelation_GeneratedIndex"); + FSIndex degreeOfTextRelations = jcas.getFSIndexRepository().getIndex("_org.apache.ctakes.typesystem.type.relation.DegreeOfTextRelation_GeneratedIndex"); int i = 0; - if (binaryTextRelations != null) { + if (locationOfTextRelations != null) { - for (FeatureStructure binaryTextRelationFS: binaryTextRelations) { + for (FeatureStructure binaryTextRelationFS: locationOfTextRelations) { i++; //logger.info("binaryTextRelationFS = " + binaryTextRelationFS); @@ -290,9 +292,9 @@ public class TemplateFillerAnnotator ext } } - if (binaryTextRelations != null) { + if (degreeOfTextRelations != null) { - for (FeatureStructure binaryTextRelationFS: binaryTextRelations) { + for (FeatureStructure binaryTextRelationFS: degreeOfTextRelations) { i++; //logger.info("binaryTextRelationFS = " + binaryTextRelationFS); @@ -345,8 +347,7 @@ public class TemplateFillerAnnotator ext logger.error("Need to implement more cases for relation: " + relation); } } - } - + } }