[mhk] r999 committed - Adds new line color to identify entries made by *robot (used to import...
codesite...@google.com
Author: jmncarvalho
Date: Tue Jul 12 11:48:19 2011
Log: Adds new line color to identify entries made by *robot (used to
import dyncoopnet auto-ids). Adds tomador5 to gacto.
http://code.google.com/p/mhk/source/detail?r=999
Modified:
/trunk/clio/src/gacto2.str
/trunk/clio/src/mappings.pl
/trunk/idb/.upload_information
/trunk/idb/build.number
/trunk/idb/build_joao_mac.xml
/trunk/idb/etc/template/new/export.vm
/trunk/idb/etc/template/new/linking.vm
/trunk/idb/etc/template/new/linking_show.vm
/trunk/idb/etc/template/new/rperson_identification.vm
/trunk/idb/etc/template/new/rperson_show.vm
=======================================
--- /trunk/clio/src/gacto2.str Mon Mar 21 05:34:25 2011
+++ /trunk/clio/src/gacto2.str Tue Jul 12 11:48:19 2011
@@ -972,6 +972,7 @@
tomador2,tomador2-representante,
tomador3,tomador3-representante,
tomador4,tomador4-representante
+ tomador5,tomador5-representante
part name=local; source=geoentity; part=atr,rel
@@ -1031,6 +1032,7 @@
tomador2,tomador2-representante,
tomador3,tomador3-representante,
tomador4,tomador4-representante,
+ tomador5,tomador5-representante,
vendedor,comprador,transportador,
emissor,emissor-representante
@@ -2051,6 +2053,8 @@
part name=tomador3-representante;source=actorm
part name=tomador4;source=actorm
part name=tomador4-representante;source=actorm
+part name=tomador5;source=actorm
+part name=tomador5-representante;source=actorm
part name=pagador;source=actorm
part name=pagador-representante;source=actorm
part name=pagador1;source=actorm
=======================================
--- /trunk/clio/src/mappings.pl Mon Mar 21 05:34:25 2011
+++ /trunk/clio/src/mappings.pl Tue Jul 12 11:48:19 2011
@@ -430,3 +430,14 @@
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 topico to class topico.
+class topico super object table topicos
+ with attributes
+ id column id baseclass id coltype varchar colsize 64 colprecision
0 pkey 1
+ and
+ subject column subject baseclass subject coltype varchar colsize
1024 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 .
=======================================
--- /trunk/idb/.upload_information Mon Mar 21 05:34:25 2011
+++ /trunk/idb/.upload_information Tue Jul 12 11:48:19 2011
@@ -1,5 +1,5 @@
-#Mon Mar 21 12:15:50 GMT 2011
-build.number=313
+#Fri Jul 08 13:58:10 WEST 2011
+build.number=360
upload.number=89
09=
-prepare.time=21/03/2011 12\:15
+prepare.time=08/07/2011 01\:58
=======================================
--- /trunk/idb/build.number Mon Mar 21 05:34:25 2011
+++ /trunk/idb/build.number Tue Jul 12 11:48:19 2011
@@ -1,4 +1,4 @@
#Build Number for ANT. Do not edit!
-#Mon Mar 21 12:15:50 GMT 2011
-build.number=314
+#Fri Jul 08 13:58:10 WEST 2011
+build.number=361
33=
=======================================
--- /trunk/idb/build_joao_mac.xml Mon Jan 17 08:15:34 2011
+++ /trunk/idb/build_joao_mac.xml Tue Jul 12 11:48:19 2011
@@ -13,7 +13,7 @@
<!-- the following two properties should be overriden form the command
line -->
<property name="tomcat.home"
value="/Users/joaocarvalho/Applications/apache-tomcat/"/>
- <property name="clio.src"
value="/Users/joaocarvalho/Desktop/Desenvolvimento/timelink/mhk/clio/"/>
+ <property name="clio.src"
value="/Users/joaocarvalho/Dropbox/Desenvolvimento/timelink/mhk/clio/"/>
<!-- <property name="tomcat.home" value="C:/tomcat"/> -->
<!-- <property name="clio.src"
value="c:/java/workspace/MHK/clio/src/"/> -->
@@ -21,7 +21,7 @@
<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="/Users/joaocarvalho/Desktop/Desenvolvimento/timelink/webapps"/>
+ <property name="dist.home"
value="/Users/joaocarvalho/Dropbox/Desenvolvimento/timelink/webapps"/>
<property name="dist.src" value="${app.name}.jar"/>
<property name="javadoc.home" value="./doc"/>
@@ -181,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/Desktop/Desenvolvimento/timelink/ant-google-code/ant-googlecode-0.0.2.jar"
name="gcupload"/>
+
classpath="/Users/joaocarvalho/Dropbox/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/export.vm Mon Jan 17 08:15:34 2011
+++ /trunk/idb/etc/template/new/export.vm Tue Jul 12 11:48:19 2011
@@ -21,7 +21,7 @@
#end
#elseif($type.equals("rpersons"))
## get all the acts
-#set($rpersons=$database.search("select * from links"))
+#set($rpersons=$database.search("SELECT rid,instance,user FROM links,
rentities where links.rid=rentities.id and rentities.user='$user'"))
##field list
n${sep}rid${sep}id${lb}
#set($i=0)
=======================================
--- /trunk/idb/etc/template/new/linking.vm Thu Dec 9 11:46:12 2010
+++ /trunk/idb/etc/template/new/linking.vm Tue Jul 12 11:48:19 2011
@@ -79,7 +79,7 @@
#foreach($result in $results)
#set($sql="select * from rentities where user='$result.user'")
- #set($totaluserlinkedpersons=$dbutils.search("SELECT count(*) as n
FROM links,rentities where links.rid=rentities.id and
rentities.user='$result.user'"))
+ #set($totaluserlinkedpersons=$dbutils.search("SELECT count(*) as n
FROM links,rentities where links.rid=rentities.id and
rentities.the_class='rperson' and rentities.user='$result.user'"))
#set($totaluserlinkedpersons=$totaluserlinkedpersons.get(0).n)
#set($tobelinked=$dbutils.addInt("$totalpersons","-$totaluserlinkedpersons"))
<tr>
=======================================
--- /trunk/idb/etc/template/new/linking_show.vm Thu Dec 9 11:46:12 2010
+++ /trunk/idb/etc/template/new/linking_show.vm Tue Jul 12 11:48:19 2011
@@ -77,15 +77,21 @@
</tr>
</thead>
+ <p style="text-align:right;padding:0;margin:0;"><small>* <span
style="width:20px;height:20px;background-color:#F5D0A9"> </span>Includes
Robot identifications</small></p>
+
#foreach($result in $results)
- <tr>
- <td>
#set($personid = $result.id)
#set($persons="yes")
- #set($rpid=$database.search("select instance from links where
rid='$result.id' limit 1"))
+ #set($rpid=$database.search("select instance,rule from links where
rid='$result.id'"))
+ #set($robotid = 0)
#foreach($rp in $rpid)
#set($personid = $rp.instance)
+ #if($rp.rule.equals("*robot"))
+ #set($robotid = 1)
+ #end
#end
+ <tr #if($robotid>0) bgcolor="#F5D0A9" #end>
+ <td>
<INPUT TYPE="CHECKBOX" NAME="personid" VALUE="$personid">
##<span class="flag" id="ri${enumber}"
onclick="Set_Cookie('$enumber','IDList','$personid','/');"><img
onmouseover="Tip(txt1)" title="Click to save this ID on your list"
src="${baseaddr}/images/flag.gif"></span>
<a title="$mhks.get('show') $result.id"
href="$resp.encodeURL("${uri}?dbname=$!dbname&action=show&id=$result.id")">$result.id</a>
=======================================
--- /trunk/idb/etc/template/new/rperson_identification.vm Mon Nov 29
10:12:47 2010
+++ /trunk/idb/etc/template/new/rperson_identification.vm Tue Jul 12
11:48:19 2011
@@ -150,16 +150,27 @@
<th>$mhks.get("relations")</th>
<th>$mhks.get("name")</th>
</tr>
+
#foreach($line in $rp_lines)
+ #isRID_for_user($line.instance $rp_user)
+
+ #set($rpid=$dbutils.search("select instance,rule from links,rentities
where links.rid=rentities.id and rentities.user='$user' and
links.instance='$line.instance'"))
+ #set($robotid = 0)
+ #foreach($rp in $rpid)
+ #if($rp.rule.equals("*robot"))
+ #set($robotid = 1)
+ #end
+ #end
+
<!-- line -> $line -->
- <tr>
+ <tr #if($robotid>0) bgcolor="#F5D0A9" #end>
<td width="15%">
#set($temp="${line.the_date}00000000")
#set($year = $temp.substring(0,4))## year = $year
#set($month = $temp.substring(4,6))## month = $month
#set($day = $temp.substring(6,8)) ## day = $day
- #isRID_for_user($line.instance $rp_user)
+
$velocityCount.<INPUT TYPE="CHECKBOX" NAME="personid"
VALUE="$line.instance" #if($this_rperson==$rid) CHECKED #end
>
<span class="name">${year}-${month}-${day}</span>
=======================================
--- /trunk/idb/etc/template/new/rperson_show.vm Mon Nov 29 10:12:47 2010
+++ /trunk/idb/etc/template/new/rperson_show.vm Tue Jul 12 11:48:19 2011
@@ -75,11 +75,12 @@
</div>
#set($rperson_info_sql="Select ")
- #set($rperson_info_sql="$rperson_info_sql instance,occurences.name, ")
+ #set($rperson_info_sql="$rperson_info_sql
instance,rule,occurences.name, ")
#set($rperson_info_sql="$rperson_info_sql functions.the_date, ")
#set($rperson_info_sql="$rperson_info_sql acts.the_type, ")
#set($rperson_info_sql="$rperson_info_sql functions.the_value as
function, ")
#set($rperson_info_sql="$rperson_info_sql functions.destination as
id_act ")
+
##set($rperson_info_sql="$rperson_info_sql attributes.the_type as
attr_type,")
##set($rperson_info_sql="$rperson_info_sql attributes.the_value as
attr_value ")
##set($rperson_info_sql="$rperson_info_sql rout.the_type as
rel_out_type, ")
@@ -117,8 +118,7 @@
#set($last_rval="")
#set($last_name="")
-
-
+ <p style="text-align:right;padding:0;margin:0;"><small>* <span
style="width:20px;height:20px;background-color:#F5D0A9"> </span>
Robot identifications</small></p>
<FORM action="${baseaddr}/servlet/do" name="rperson">
<INPUT TYPE="HIDDEN" NAME="dbname" value='$dbname'>
@@ -134,7 +134,8 @@
</tr>
#foreach($line in $rp_lines)
<!-- line -> $line -->
- <tr>
+
+ <tr #if($line.rule.equals("*robot")) bgcolor="#F5D0A9" #end>
<td width="15%" valign="top">
#set($temp="${line.the_date}00000000")