[mhk] r997 committed - Adds new mapping rules for cartas, adendas and eventos. Ads autorelati...

0 views
Skip to first unread message

codesite...@google.com

unread,
Mar 21, 2011, 8:34:46 AM3/21/11
to mhk-dis...@googlegroups.com
Revision: 997
Author: jmncarvalho
Date: Mon Mar 21 05:34:25 2011
Log: Adds new mapping rules for cartas, adendas and eventos. Ads
autorelations to cartas based on lc. Adds evento to adenda on gacto. Adds
inside on geoentity_show.vm.
http://code.google.com/p/mhk/source/detail?r=997

Modified:
/trunk/clio/src/gacto2.str
/trunk/clio/src/inference.pl
/trunk/clio/src/mappings.pl
/trunk/idb/.upload_information
/trunk/idb/build.number
/trunk/idb/build_joao.xml
/trunk/idb/etc/template/new/geoentity_show.vm
/trunk/idb/pt/uc/cisuc/jrc/mhk/resources/MHKStrings.properties
/trunk/idb/pt/uc/cisuc/jrc/mhk/resources/MHKStrings_pt.properties

=======================================
--- /trunk/clio/src/gacto2.str Fri Jan 28 04:40:24 2011
+++ /trunk/clio/src/gacto2.str Mon Mar 21 05:34:25 2011
@@ -982,8 +982,9 @@

part name=adenda; source=pt-acto;
position=id,dia,mes,ano,loc;
- also=resumo,refere,obs
-
+ also=resumo,refere,obs;
+ part=evento
+
part name=evento; source=pt-acto;
position=description,dia,mes,ano;
guaranteed=description;
=======================================
--- /trunk/clio/src/inference.pl Tue May 11 07:44:08 2010
+++ /trunk/clio/src/inference.pl Mon Mar 21 05:34:25 2011
@@ -2559,6 +2559,171 @@
[kleio(K),fonte(F),carta(L),vendedor(P)]
then
relation(comercial,'vendedor-comprador',P,R).
+
+if [kleio(K),fonte(F),carta(L),beneficiario(R)] and
+ [kleio(K),fonte(F),carta(L),'beneficiario-representante'(P)]
+then
+ relation(sociabilidade,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),beneficiario1(R)] and
+ [kleio(K),fonte(F),carta(L),'beneficiario1-representante'(P)]
+then
+ relation(sociabilidade,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),beneficiario2(R)] and
+ [kleio(K),fonte(F),carta(L),'beneficiario2-representante'(P)]
+then
+ relation(sociabilidade,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),beneficiario3(R)] and
+ [kleio(K),fonte(F),carta(L),'beneficiario3-representante'(P)]
+then
+ relation(sociabilidade,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),beneficiario4(R)] and
+ [kleio(K),fonte(F),carta(L),'beneficiario4-representante'(P)]
+then
+ relation(sociabilidade,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),beneficiario(R)] and
+ [kleio(K),fonte(F),carta(L),'beneficiario-procurador'(P)]
+then
+ relation(sociabilidade,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),dador(R)] and
+ [kleio(K),fonte(F),carta(L),'dador-representante'(P)]
+then
+ relation(confianca,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),dador1(R)] and
+ [kleio(K),fonte(F),carta(L),'dador1-representante'(P)]
+then
+ relation(confianca,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),dador2(R)] and
+ [kleio(K),fonte(F),carta(L),'dador2-representante'(P)]
+then
+ relation(confianca,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),dador3(R)] and
+ [kleio(K),fonte(F),carta(L),'dador3-representante'(P)]
+then
+ relation(confianca,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),dador4(R)] and
+ [kleio(K),fonte(F),carta(L),'dador4-representante'(P)]
+then
+ relation(confianca,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),pagador(R)] and
+ [kleio(K),fonte(F),carta(L),'pagador-representante'(P)]
+then
+ relation(confianca,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),pagador1(R)] and
+ [kleio(K),fonte(F),carta(L),'pagador1-representante'(P)]
+then
+ relation(confianca,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),pagador2(R)] and
+ [kleio(K),fonte(F),carta(L),'pagador2-representante'(P)]
+then
+ relation(confianca,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),pagador3(R)] and
+ [kleio(K),fonte(F),carta(L),'pagador3-representante'(P)]
+then
+ relation(confianca,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),pagador4(R)] and
+ [kleio(K),fonte(F),carta(L),'pagador4-representante'(P)]
+then
+ relation(confianca,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),recebedor(R)] and
+ [kleio(K),fonte(F),carta(L),'recebedor-proc'(P)]
+then
+ relation(sociabilidade,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),recebedor1(R)] and
+ [kleio(K),fonte(F),carta(L),'recebedor1-proc'(P)]
+then
+ relation(sociabilidade,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),recebedor2(R)] and
+ [kleio(K),fonte(F),carta(L),'recebedor2-proc'(P)]
+then
+ relation(sociabilidade,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),recebedor3(R)] and
+ [kleio(K),fonte(F),carta(L),'recebedor3-proc'(P)]
+then
+ relation(sociabilidade,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),recebedor4(R)] and
+ [kleio(K),fonte(F),carta(L),'recebedor4-proc'(P)]
+then
+ relation(sociabilidade,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),tomador(R)] and
+ [kleio(K),fonte(F),carta(L),'tomador-representante'(P)]
+then
+ relation(confianca,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),tomador1(R)] and
+ [kleio(K),fonte(F),carta(L),'tomador1-representante'(P)]
+then
+ relation(confianca,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),tomador2(R)] and
+ [kleio(K),fonte(F),carta(L),'tomador2-representante'(P)]
+then
+ relation(confianca,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),tomador3(R)] and
+ [kleio(K),fonte(F),carta(L),'tomador3-representante'(P)]
+then
+ relation(confianca,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),tomador4(R)] and
+ [kleio(K),fonte(F),carta(L),'tomador4-representante'(P)]
+then
+ relation(confianca,procurador,P,R).
+if [kleio(K),fonte(F),carta(L),beneficiario(R)] and
+ [kleio(K),fonte(F),carta(L),dador(P)]
+then
+ relation(financeira,'dador-beneficiario',P,R).
+if [kleio(K),fonte(F),carta(L),beneficiario1(R)] and
+ [kleio(K),fonte(F),carta(L),dador1(P)]
+then
+ relation(financeira,'dador1-beneficiario1',P,R).
+if [kleio(K),fonte(F),carta(L),beneficiario2(R)] and
+ [kleio(K),fonte(F),carta(L),dador2(P)]
+then
+ relation(financeira,'dador2-beneficiario1',P,R).
+if [kleio(K),fonte(F),carta(L),beneficiario3(R)] and
+ [kleio(K),fonte(F),carta(L),dador3(P)]
+then
+ relation(financeira,'dador3-beneficiario3',P,R).
+if [kleio(K),fonte(F),carta(L),beneficiario4(R)] and
+ [kleio(K),fonte(F),carta(L),dador4(P)]
+then
+ relation(financeira,'dador4-beneficiario4',P,R).
+if [kleio(K),fonte(F),carta(L),pagador(R)] and
+ [kleio(K),fonte(F),carta(L),tomador(P)]
+then
+ relation(financeira,'tomador-pagador',P,R).
+if [kleio(K),fonte(F),carta(L),pagador1(R)] and
+ [kleio(K),fonte(F),carta(L),tomador1(P)]
+then
+ relation(financeira,'tomador1-pagador1',P,R).
+if [kleio(K),fonte(F),carta(L),pagador2(R)] and
+ [kleio(K),fonte(F),carta(L),tomador2(P)]
+then
+ relation(financeira,'tomador2-pagador3',P,R).
+if [kleio(K),fonte(F),carta(L),pagador3(R)] and
+ [kleio(K),fonte(F),carta(L),tomador3(P)]
+then
+ relation(financeira,'tomador3-pagador3',P,R).
+if [kleio(K),fonte(F),carta(L),pagador4(R)] and
+ [kleio(K),fonte(F),carta(L),tomador4(P)]
+then
+ relation(financeira,'tomador4-pagador4',P,R).
+if [kleio(K),fonte(F),carta(L),pagador(R)] and
+ [kleio(K),fonte(F),carta(L),dador(P)]
+then
+ relation(financeira,'dador-tomador',P,R).
+if [kleio(K),fonte(F),carta(L),pagador1(R)] and
+ [kleio(K),fonte(F),carta(L),dador1(P)]
+then
+ relation(financeira,'dador1-tomador1',P,R).
+if [kleio(K),fonte(F),carta(L),pagador2(R)] and
+ [kleio(K),fonte(F),carta(L),dador2(P)]
+then
+ relation(financeira,'dador2-tomador2',P,R).
+if [kleio(K),fonte(F),carta(L),pagador3(R)] and
+ [kleio(K),fonte(F),carta(L),dador3(P)]
+then
+ relation(financeira,'dador3-tomador3',P,R).
+if [kleio(K),fonte(F),carta(L),pagador4(R)] and
+ [kleio(K),fonte(F),carta(L),dador4(P)]
+then
+ relation(financeira,'dador4-tomador4',P,R).

/************************************************************

=======================================
--- /trunk/clio/src/mappings.pl Thu Sep 3 09:04:26 2009
+++ /trunk/clio/src/mappings.pl Mon Mar 21 05:34:25 2011
@@ -388,4 +388,45 @@
descricao column descricao baseclass descricao coltype varchar
colsize 1024 colprecision 0 pkey 0
and
obs column obs baseclass obs coltype varchar colsize 1024
colprecision 0 pkey 0 .
-
+
+
+mapping carta to class carta.
+class carta super act table cartas
+ with attributes
+ id column id baseclass id coltype varchar colsize 64 colprecision
0 pkey 1
+ and
+ date column the_date baseclass date coltype varchar colsize 24
colprecision 0 pkey 0
+ and
+ loc column loc baseclass loc coltype varchar colsize 64
colprecision 0 pkey 0
+ and
+ resumo column resumo baseclass resumo coltype varchar colsize 1024
colprecision 0 pkey 0
+ and
+ refere column refere baseclass refere coltype varchar colsize 1024
colprecision 0 pkey 0
+ and
+ obs column obs baseclass obs coltype varchar colsize 1024
colprecision 0 pkey 0 .
+
+mapping evento to class evento.
+class evento super act table eventos
+ with attributes
+ id column id baseclass id coltype varchar colsize 64 colprecision
0 pkey 1
+ and
+ date column the_date baseclass date coltype varchar colsize 24
colprecision 0 pkey 0
+ and
+ description column description baseclass description coltype
varchar colsize 1024 colprecision 0 pkey 0
+ and
+ obs column obs baseclass obs coltype varchar colsize 1024
colprecision 0 pkey 0 .
+
+mapping adenda to class adenda.
+class adenda super act table adendas
+ with attributes
+ id column id baseclass id coltype varchar colsize 64 colprecision
0 pkey 1
+ and
+ date column the_date baseclass date coltype varchar colsize 24
colprecision 0 pkey 0
+ and
+ loc column loc baseclass loc coltype varchar colsize 64
colprecision 0 pkey 0
+ and
+ resumo column resumo baseclass resumo coltype varchar colsize 1024
colprecision 0 pkey 0
+ and
+ refere column refere baseclass refere coltype varchar colsize 1024
colprecision 0 pkey 0
+ and
+ obs column obs baseclass obs coltype varchar colsize 1024
colprecision 0 pkey 0 .
=======================================
--- /trunk/idb/.upload_information Tue Jan 11 04:07:31 2011
+++ /trunk/idb/.upload_information Mon Mar 21 05:34:25 2011
@@ -1,5 +1,5 @@
-#Tue Jan 11 12:04:10 WET 2011
-build.number=189
+#Mon Mar 21 12:15:50 GMT 2011
+build.number=313
upload.number=89
09=
-prepare.time=11/01/2011 12\:04
+prepare.time=21/03/2011 12\:15
=======================================
--- /trunk/idb/build.number Mon Jan 17 08:15:34 2011
+++ /trunk/idb/build.number Mon Mar 21 05:34:25 2011
@@ -1,4 +1,4 @@
#Build Number for ANT. Do not edit!
-#Mon Jan 17 15:36:59 WET 2011
-build.number=305
+#Mon Mar 21 12:15:50 GMT 2011
+build.number=314
33=
=======================================
--- /trunk/idb/build_joao.xml Sun Mar 7 06:22:34 2010
+++ /trunk/idb/build_joao.xml Mon Mar 21 05:34:25 2011
@@ -1,4 +1,4 @@
-<project name="Micro History with Kleio (JC@MAC)" default="compile"
basedir=".">
+<project name="Micro History with Kleio (JC@LINUX)" default="compile"
basedir=".">

<!-- Simple "Hello, World" project to provide a concrete example of
the recommendations in the Application Developer's Guide.
@@ -13,22 +13,23 @@

<!-- the following two properties should be overriden form the command
line -->
<property name="tomcat.home"
value="/home/joaocarvalho/Applications/apache-tomcat/"/>
- <property name="clio.src"
value="/media/DADOS/Desenvolvimento/timelink/mhk/clio/"/>
-
+ <property name="clio.src"
value="/media/DATA/Desenvolvimento/timelink/mhk/clio/"/>
+
<!-- <property name="tomcat.home" value="C:/tomcat"/> -->
<!-- <property name="clio.src"
value="c:/java/workspace/MHK/clio/src/"/> -->
-
+
<property name="app.name" value="mhk"/>
<property name="version" value="2.1"/>
<property name="deploy.home"
value="${tomcat.home}webapps/${app.name}"/>
- <property name="dist.home"
value="/media/DADOS/Desenvolvimento/timelink/"/>
+ <property name="dist.home"
value="/media/DATA/Desenvolvimento/timelink/webapps"/>
<property name="dist.src" value="${app.name}.jar"/>
<property name="javadoc.home" value="./doc"/>

<!-- these are used in the updateUserProps target -->
<property name="user.jc.home" value="/Users/joaocarvalho/"/>
<property name="user.jc.propsfile" value="jc.mhk.properties"/>
-
+ <property file="${user.jc.home}/build.mhk.properties"/>
+

<property file="build.properties"/>
<property name="servlet.jar" value="lib/servlet.jar"/>
@@ -130,7 +131,7 @@

<javac srcdir="." destdir="${deploy.home}/WEB-INF/classes"
target="1.5" source="1.5"

classpath="${deploy.home}/WEB-INF/lib/baf.jar:${deploy.home}/WEB-INF/lib/jdom.jar:${deploy.home}/WEB-INF/lib/log4j-1.2.15.jar:${deploy.home}/WEB-INF/lib/dom4j-1.5-beta-2.jar:${deploy.home}/WEB-INF/classes:${deploy.home}/WEB-INF/lib/lucene-1.4-final.jar:${deploy.home}/WEB-INF/lib/xerces.jar:${deploy.home}/WEB-INF/lib/velocity-dep-1.4.jar:${servlet.jar}:${junit.jar}:${deploy.home}/WEB-INF/lib/commons-fileupload-1.0.jar:${deploy.home}/WEB-INF/lib/antisamy-bin.1.3.jar:${deploy.home}/WEB-INF/lib/nekohtml.jar:${deploy.home}/WEB-INF/lib/gedcom.jar:${deploy.home}/WEB-INF/lib/gedcom4j.jar"
- debug="on" optimize="off" deprecation="on"/>
+ debug="on" optimize="off" deprecation="off"/>
</target>


@@ -180,7 +181,7 @@

<target name="upload" depends="prepare-upload,dist"
description="Upload the distribution to google code">
<taskdef
classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask"
-
classpath="/Users/joaocarvalho/Desenvolvimento/mhk/ant-google-code/ant-googlecode-0.0.2.jar"
name="gcupload"/>
+
classpath="/home/joaocarvalho/Desenvolvimento/timelink/ant-google-code/ant-googlecode-0.0.2.jar"
name="gcupload"/>
<echo message="Uploading with ${gc.username} and ${gc.password}
filename: ${app.name}${version}-${upload.number}.zip"/>
<gcupload username="${gc.username}" password="${gc.password}"
projectname="mhk"

filename="${dist.home}/${app.name}${version}-${build.number}.zip"
=======================================
--- /trunk/idb/etc/template/new/geoentity_show.vm Mon Jan 17 11:42:38 2011
+++ /trunk/idb/etc/template/new/geoentity_show.vm Mon Mar 21 05:34:25 2011
@@ -265,7 +265,8 @@
#end
<ul>
<li class="value"><span class="name">id:</span> $id</li>
- <li class="value"><span
class="name">$mhks.get('person.rid.show') :</span> <A
HREF=$resp.encodeURL("${uri}?dbname=$!db.dbname&action=show&id=$Entity.rid")>$Entity.rid</A></li>
+ <li class="value"><span class="name">inside:</span> <a
href=$resp.encodeURL("${uri}?dbname=$!db.dbname&action=show&id=$Entity.inside")>$Entity.inside</a></li>
+ <li class="value"><span class="name">$mhks.get('rid.show') :</span> <A
HREF=$resp.encodeURL("${uri}?dbname=$!db.dbname&action=show&id=$Entity.rid")>$Entity.rid</A></li>
</ul>
</p>

=======================================
--- /trunk/idb/pt/uc/cisuc/jrc/mhk/resources/MHKStrings.properties Tue Jan
18 12:38:52 2011
+++ /trunk/idb/pt/uc/cisuc/jrc/mhk/resources/MHKStrings.properties Mon Mar
21 05:34:25 2011
Binary file, no diff available.
=======================================
--- /trunk/idb/pt/uc/cisuc/jrc/mhk/resources/MHKStrings_pt.properties Tue
Jan 18 12:38:52 2011
+++ /trunk/idb/pt/uc/cisuc/jrc/mhk/resources/MHKStrings_pt.properties Mon
Mar 21 05:34:25 2011
Binary file, no diff available.
Reply all
Reply to author
Forward
0 new messages