Hello,
When I run Tomcat on Windows and upload (with IE) a file with non-ascii characters in the filename it goes well.
But when I run Tomcat on Linux and do the same upload it doesn't recognize the non-ascii characters and prints them as squares or question mark.
Does anybody have experience with this?
Greeting,
Ronald.
? java-src/jspc
? web/test.html
? web/WEB-INF/jsp/forms/maintenance
Index: java-src/nl/base/rela/entities/Hour.java
===================================================================
RCS file: /var/cvs/crm/java-src/nl/base/rela/entities/Hour.java,v
retrieving revision 1.7
diff -b -u -r1.7 Hour.java
--- java-src/nl/base/rela/entities/Hour.java 27 Nov 2003 11:39:37 -0000 1.7
+++ java-src/nl/base/rela/entities/Hour.java 2 Dec 2003 09:12:28 -0000
@@ -62,7 +62,8 @@
String field = s.getString("field");
String value = s.getString("value");
list.addFieldValue(field, value);
-System.err.println("queryId"+ queryId);
+System.err.println("queryId "+ queryId);
+
String employee = s.getString("employeesearch");
if (queryId.equals("longhours")) {
Index: web/WEB-INF/database.xml
===================================================================
RCS file: /var/cvs/crm/web/WEB-INF/database.xml,v
retrieving revision 1.44
diff -b -u -r1.44 database.xml
--- web/WEB-INF/database.xml 25 Nov 2003 15:38:55 -0000 1.44
+++ web/WEB-INF/database.xml 2 Dec 2003 09:12:29 -0000
@@ -116,7 +116,7 @@
<table name="department" ownerColumn="none" />
<table name="emailidentities" />
<table name="grouprights" />
- <table name="groups" ownerColumn="none" />
+ <table name="groups" keyColumn="groupid" ownerColumn="none" />
<table name="keynum" />
<table name="logins" />
<table name="rights" />
Index: web/WEB-INF/modules.xml
===================================================================
RCS file: /var/cvs/crm/web/WEB-INF/modules.xml,v
retrieving revision 1.11
diff -b -u -r1.11 modules.xml
--- web/WEB-INF/modules.xml 28 Nov 2003 12:17:07 -0000 1.11
+++ web/WEB-INF/modules.xml 2 Dec 2003 09:12:29 -0000
@@ -22,7 +22,6 @@
]>
<modules>
-
<group name="rela">
<module name="bookmark" class="nl.base.rela.entities.Employee">
<htmlViewData
Index: web/WEB-INF/jsp/forms/rela/mainemployee.jsp
===================================================================
RCS file: /var/cvs/crm/web/WEB-INF/jsp/forms/rela/mainemployee.jsp,v
retrieving revision 1.6
diff -b -u -r1.6 mainemployee.jsp
--- web/WEB-INF/jsp/forms/rela/mainemployee.jsp 21 Nov 2003 11:38:34 -0000 1.6
+++ web/WEB-INF/jsp/forms/rela/mainemployee.jsp 2 Dec 2003 09:12:29 -0000
@@ -19,8 +19,21 @@
<html:flowlayout direction="horizontal">
- <html:flowlayout width="80" direction="vertical">
+ <html:flowlayout width="80" direction="vertical" padding="3">
<html:button label="Bewaar" submit="true" />
+ <html:button label="Bewaar / sluit" submit="true" />
+ <html:button label="Annuleren" submit="false" />
+ <html:spacer height="8" />
+ <html:button label="Brieven / email" submit="true" />
+ <html:button label="Uren" submit="true" />
+ <html:button label="Kenmerken" submit="false" />
+ <html:button label="SMS" submit="true" />
+ <html:button label="Etiket" submit="true" />
+ <html:button label="Agenda" submit="false" />
+ <html:button label="Taken" submit="true" />
+ <html:spacer height="8" />
+ <html:button label="Route" submit="true" />
+ <html:button label="Buurtinfo" submit="false" />
</html:flowlayout>
<html:spacer width="10" />
@@ -30,90 +43,169 @@
<html:flowlayout direction="horizontal" padding="3">
<html:labelEdit labelWidth="65"
inputWidth="65" label="Relatiecode" field="rcode" disabled="true" />
<html:spacer width="90" />
- <html:labelCombo disabled="true"
label="Afdeling" field="rowner2" labelWidth="50" mask="<%=
user.getSettings().getXML("uren_department") %>"/>
+ <html:labelCombo label="Afdeling"
field="rowner2" labelWidth="50" mask="<%= user.getSettings().getXML("uren_department")
%>"/>
<html:labelDateTime label="Last update"
field="rlastup" labelWidth="70" disabled="true" />
</html:flowlayout>
<html:spacer />
- <html:flowlayout direction="horizontal">
- <html:labelCombo label="Geslacht" field="sex"
direction="vertical" width="65"/>
+ <html:flowlayout direction="horizontal" padding="-1">
+ <html:labelCombo label="Geslacht" field="sex"
direction="vertical" width="66"/>
<html:labelEdit label="Titel" field="title"
direction="vertical" width="66"/>
<html:labelEdit label="Initialen"
field="initials" direction="vertical" width="66"/>
<html:labelEdit label="Tussenv"
field="middlename" direction="vertical" width="66"/>
- <html:labelEdit label="Achternaam"
field="lastname" direction="vertical" width="224"/>
+ <html:labelEdit label="Achternaam"
field="lastname" direction="vertical" width="225"/>
<html:labelEdit label="Titel" field="surtitle"
direction="vertical" width="65"/>
</html:flowlayout>
<html:spacer />
+ <html:flowlayout direction="horizontal" padding="0">
<html:flowlayout direction="vertical" padding="2">
- <html:flowlayout direction="horizontal">
- <html:labelEdit label="Roepnaam"
field="firstname" labelWidth="150" inputWidth="200" />
- <html:labelDateTime label="Datum in"
field="rdatein" disabled="true" />
+ <html:labelEdit label="Roepnaam"
field="firstname" labelWidth="150" inputWidth="201" />
+ <html:labelCombo label="Soort
medewerker" field="typerela" labelWidth="150" selectWidth="201" mask="<%=
user.getSettings().getXML("rela_emp_type") %>" />
+ <html:labelSearch field="account"
entity="employee" labelWidth="150" inputWidth="50" resultWidth="135" label="Account
manager" />
</html:flowlayout>
- <html:flowlayout direction="horizontal">
- <html:labelCombo label="Soort
medewerker" field="typerela" labelWidth="150" selectWidth="200" mask="<%=
user.getSettings().getXML("rela_emp_type") %>" />
- <html:labelEdit label="Email"
field="email" />
+ <html:flowlayout direction="vertical"
padding="2">
+ <html:labelDateTime label="Datum in"
field="rdatein" disabled="true" left="-1"/>
+ <html:labelEdit label="Email"
field="email" left="-1"/>
+ <html:labelEdit field="mobile"
label="Mobiel" left="-1"/>
</html:flowlayout>
- <html:flowlayout direction="horizontal">
- <html:labelSearch field="account"
entity="employee" labelWidth="150" inputWidth="50" resultWidth="134" label="Account
manager" />
- <html:labelEdit field="mobile"
label="Mobiel" />
</html:flowlayout>
+
+ <html:spacer />
+ <html:flowlayout direction="horizontal" padding="2">
<html:buttonEdit label="Homepage"
field="homepage" inputWidth="450" />
</html:flowlayout>
<html:spacer height="10"/>
- <html:pageFrame width="550" height="200">
- <html:tab title="Huisadres" >
+
+
+
+
+
+
+
+
+
+
+ <html:pageFrame width="550" height="210">
+ <html:tab title="Huisadres">
<html:spacer height="20"/>
- <html:flowlayout direction="vertical"
padding="3">
- <html:flowlayout padding="3"
direction="horizontal">
- <html:labelEdit
label="Adresregel 1" field="hstreet" />
- <html:labelEdit
label="Huisnr" field="hhouseno" />
- </html:flowlayout>
- <html:labelEdit
label="Adresregel 2" field="hstreet2" />
- <html:flowlayout padding="3"
direction="horizontal">
- <html:labelEdit
label="Postcode" field="hzipcode" />
- <html:labelEdit
label="Woonplaats" field="hcity" />
- </html:flowlayout>
- <html:flowlayout padding="3"
direction="horizontal">
- <html:labelEdit
label="Land" field="hcountry" />
- <html:labelEdit
label="Tel. Thuis" field="tel2" />
+
+ <html:flowlayout
direction="vertical" padding="2" left="20">
+ <html:flowlayout
padding="0" direction="horizontal">
+ <html:button
width="300" label="Adres+woonplaats (huisnr+postcode)"/>
+ </html:flowlayout>
+ <html:spacer
height="5"/>
+ <html:flowlayout
padding="-1" direction="horizontal">
+
<html:labelEdit labelWidth="100" label="Adresregel 1" field="hstreet"
inputWidth="201"/>
+
<html:labelEdit labelWidth="50" label="Huisnr." field="hhouseno" inputWidth="50"/>
+
<html:labelEdit labelWidth="50" label="Toev." field="hhousenoext" inputWidth="50"/>
+ </html:flowlayout>
+ <html:labelEdit
labelWidth="100" label="Adresregel 2" field="hstreet2" inputWidth="201" />
+ <html:flowlayout
padding="0" direction="horizontal">
+
<html:labelEdit label="Postcode" field="hzipcode"/>
+
<html:labelEdit label="Woonplaats" field="hcity" inputWidth="200" left="-1"/>
+ </html:flowlayout>
+ <html:flowlayout
padding="0" direction="horizontal">
+
<html:labelEdit label="Land" field="hcountry" inputWidth="200"/>
+
<html:labelEdit label="Tel. Thuis" field="tel2" left="-1"/>
</html:flowlayout>
</html:flowlayout>
</html:tab>
+
<html:tab title="Bedrijfsadres">
- <html:spacer height="60" />
- <html:label width="500" align="left"
text="Dit is waanzin. Waarom kunnen mensen niet gewoon een bedrijf selecteren en
klaar?" />
+ <html:spacer
height="20"/>
+
+
+ <html:flowlayout
direction="vertical" padding="2" left="20">
+ <html:flowlayout
padding="0" direction="horizontal">
+ <html:button
width="300" label="Adres+woonplaats (huisnr+postcode)"/>
+ </html:flowlayout>
+ <html:spacer
height="5"/>
+ <html:flowlayout
padding="0" direction="horizontal">
+
<html:labelEdit labelWidth="100" label="Naam Bedrijf" field="company"
inputWidth="201"/>
+ </html:flowlayout>
+ <html:flowlayout
padding="0" direction="horizontal">
+
<html:labelEdit labelWidth="100" label="Zoeknaam Bedrijf" field="searchcomp"
inputWidth="201"/>
+ </html:flowlayout>
+ <html:flowlayout
padding="-1" direction="horizontal">
+
<html:labelEdit labelWidth="100" label="Adresregel 1" field="ostreet"
inputWidth="201"/>
+
<html:labelEdit labelWidth="50" label="Huisnr." field="ohouseno" inputWidth="50" />
+
<html:labelEdit labelWidth="50" label="Toev." field="ohousenoext" inputWidth="50"/>
+ </html:flowlayout>
+ <html:labelEdit
labelWidth="100" label="Adresregel 2" field="ostreet2" inputWidth="201" />
+ <html:flowlayout
padding="0" direction="horizontal">
+
<html:labelEdit label="Postcode" field="ozipcode"/>
+
<html:labelEdit label="Woonplaats" field="ocity" inputWidth="200" left="-1"/>
+ </html:flowlayout>
+ <html:flowlayout
padding="0" direction="horizontal">
+
<html:labelEdit label="Land" field="ocountry" inputWidth="200"/>
+
<html:labelEdit label="Tel." field="otel2" left="-1"/>
+ </html:flowlayout>
+ </html:flowlayout>
</html:tab>
- <html:tab title="Mailadres">
- <html:spacer height="20" />
- <html:grid left="0" top="0"
width="500" height="120" >
- <html:gridColumn width="90"
header="Relatie Code">
- ${rcode}
- </html:gridColumn>
- <html:gridColumn width="500"
header="Relatie Code">
- ${rcode}
- </html:gridColumn>
- </html:grid>
+
+ <html:tab title="Postadres">
+ <html:spacer
height="20"/>
+
+ <html:flowlayout
direction="vertical" padding="2" left="20">
+ <html:flowlayout
padding="3" direction="horizontal">
+ <html:button
label="Kopieer huisadres" width="148"/>
+ <html:button
label="Kopieer bedrijfsadres" width="149"/>
+ </html:flowlayout>
+ <html:spacer
height="5"/>
+ <html:flowlayout
padding="0" direction="horizontal">
+
<html:labelEdit labelWidth="100" label="Adresregel 1" field="mstreet"
inputWidth="201"/>
+
<html:labelEdit labelWidth="50" label="Huisnr." field="mhouseno" inputWidth="50"
left="-1"/>
+
<html:labelEdit labelWidth="50" label="Toev." field="mhousenoext" inputWidth="50"
left="-2"/>
+ </html:flowlayout>
+ <html:labelEdit
labelWidth="100" label="Adresregel 2" field="mstreet2" inputWidth="201" />
+ <html:flowlayout
padding="0" direction="horizontal">
+
<html:labelEdit label="Postcode" field="mzipcode"/>
+
<html:labelEdit label="Woonplaats" field="mcity" inputWidth="200" left="-1"/>
+ </html:flowlayout>
+ <html:flowlayout
padding="0" direction="horizontal">
+
<html:labelEdit label="Land" field="mcountry" inputWidth="200"/>
+
<html:labelEdit label="Tel. Thuis" field="mtel2" left="-1"/>
+ </html:flowlayout>
+ </html:flowlayout>
</html:tab>
+
<html:tab title="Opmerkingen">
<html:spacer height="20"/>
- <html:textarea field="notes"
width="523" height="120"/>
+ <html:textarea field="notes"
width="510" height="120" left="20"/>
</html:tab>
<html:tab title="Overige">
<html:spacer height="20"/>
- <html:flowlayout
direction="horizontal">
+ <html:flowlayout
direction="horizontal" left="20">
<html:flowlayout
direction="vertical" padding="3">
- <html:labelCombo
label="combo1" field="combosel1" mask="<%= user.getSettings().getXML("combosel1","")
%>" />
- <html:labelEdit
label="Nationaliteit" field="nationality" />
- <html:labelCombo
label="Aanhef" field="saluation" mask="<%=
user.getSettings().getXML("rela_emp_salutation") %>" />
- <html:labelEdit
label="Verjaardag" field="birthday" />
- <html:labelEdit
label="Fax" field="fax" />
- <html:labelCombo
label="Soort functie" field="typefunct" mask="<%=
user.getSettings().getXML("rela_emp_func", "") %>"/>
- <html:labelEdit
label="Functieomschrijving" field="functdescr" />
+ <html:labelCombo
label="combo1" field="combosel1" selectWidth="130" mask="<%=
user.getSettings().getXML("combosel1","") %>" labelWidth="130"/>
+
+
<html:flowlayout direction="horizontal">
+
<html:labelEdit label="Nationaliteit" field="nationality" labelWidth="130"
inputWidth="130"/>
+
<html:labelEdit label="Sofinummer" field="sofinr" labelWidth="130" inputWidth="130"
left="-1"/>
+
</html:flowlayout>
+
<html:flowlayout direction="horizontal">
+
<html:labelCombo label="Aanhef" field="saluation" labelWidth="130" selectWidth="130"
mask="<%= user.getSettings().getXML("rela_emp_salutation") %>" />
+
<html:labelEdit label="Wachtwoord Admin" field="password" labelWidth="130"
inputWidth="130" left="-1"/>
+
</html:flowlayout>
+
<html:flowlayout direction="horizontal">
+
<html:labelEdit label="Verjaardag" field="birthday" labelWidth="130" inputWidth="130"/>
+
<html:labelEdit label="Geboorteplaats" field="rbirthcity" labelWidth="130"
inputWidth="130" left="-1"/>
+
</html:flowlayout>
+
<html:flowlayout direction="horizontal">
+
<html:labelEdit label="Fax" field="fax" labelWidth="130" inputWidth="130"/>
+
<html:labelEdit label="Naam partner" field="plastname" labelWidth="130"
inputWidth="130" left="-1"/>
+
</html:flowlayout>
+ <html:spacer
height="5"/>
+
<html:flowlayout direction="horizontal">
+
<html:labelCombo label="Soort functie" field="typefunct" labelWidth="130"
selectWidth="130" mask="<%= user.getSettings().getXML("rela_emp_func", "") %>"/>
+
<html:labelEdit label="Functieomschrijving" field="functdescr" labelWidth="130"
inputWidth="130" left="-1"/>
+
</html:flowlayout>
+ <html:labelCheckbox
label="Inactief" field="active" labelWidth="111" checkBoxWidth="18" left="390"/>
</html:flowlayout>
<%--
<html:flowlayout
direction="vertical" padding="3">
@@ -126,6 +218,8 @@
</html:flowlayout>
--%>
</html:flowlayout>
+ </html:tab>
+ <html:tab title="Extra">
</html:tab>
<html:tab title="Foto">
</html:tab>
Index: web/WEB-INF/jsp/forms/rela/mainhour.jsp
===================================================================
RCS file: /var/cvs/crm/web/WEB-INF/jsp/forms/rela/mainhour.jsp,v
retrieving revision 1.3
diff -b -u -r1.3 mainhour.jsp
--- web/WEB-INF/jsp/forms/rela/mainhour.jsp 27 Nov 2003 08:47:38 -0000 1.3
+++ web/WEB-INF/jsp/forms/rela/mainhour.jsp 2 Dec 2003 09:12:29 -0000
@@ -6,7 +6,7 @@
<%@ taglib uri="/WEB-INF/tld/misc.tld" prefix="misc" %>
<misc:getUser/>
-<html:document type="maintenance" title="Uren divers" entity="hour"
dataSource="entity">
+<html:document type="maintenance" title="Mainhour" entity="hour" dataSource="entity" >
<html:head>
function checkbeforesave() {
@@ -40,7 +40,7 @@
<html:body padding="10">
- <html:flashHeader height="30" right="0" headerText="Uren divers"/>
+ <html:flashHeader height="30" right="0" headerText="Uren"/>
<html:form left="10" action="save">
@@ -93,11 +93,11 @@
<html:labelSearch field="hacode"
entity="employee" labelWidth="75" inputWidth="78" resultWidth="370"
label="Activiteit"/>
</html:flowlayout>
- <html:label name="Opmerkingen" width="80"/>
-
-
+ <html:spacer height="3"/>
+ <html:label width="539" align="left"
text="Specificatie uren" />
+ <html:textarea field="notes" width="539" height="120"/>
</html:flowlayout>
Index: web/WEB-INF/jsp/forms/rela/mainperson.jsp
===================================================================
RCS file: /var/cvs/crm/web/WEB-INF/jsp/forms/rela/mainperson.jsp,v
retrieving revision 1.2
diff -b -u -r1.2 mainperson.jsp
--- web/WEB-INF/jsp/forms/rela/mainperson.jsp 25 Nov 2003 09:56:41 -0000 1.2
+++ web/WEB-INF/jsp/forms/rela/mainperson.jsp 2 Dec 2003 09:12:29 -0000
@@ -216,7 +216,7 @@
<html:labelEdit label="Voornamen" field="christianname" labelWidth="130"
inputWidth="130" left="-1"/>
</html:flowlayout>
<html:flowlayout direction="horizontal">
-
<html:labelEdit label="Verjaardag" field="birthday" labelWidth="130" inputWidth="130"/>
+
<html:labelDate label="Verjaardag" field="birthday" labelWidth="130" inputWidth="112"/>
<html:labelEdit label="Geboorteplaats" field="rbirthcity" labelWidth="130"
inputWidth="130" left="-1"/>
</html:flowlayout>
<html:flowlayout direction="horizontal">
Index: web/WEB-INF/jsp/forms/rela/searchemployee.jsp
===================================================================
RCS file: /var/cvs/crm/web/WEB-INF/jsp/forms/rela/searchemployee.jsp,v
retrieving revision 1.7
diff -b -u -r1.7 searchemployee.jsp
--- web/WEB-INF/jsp/forms/rela/searchemployee.jsp 26 Nov 2003 16:46:41 -0000
1.7
+++ web/WEB-INF/jsp/forms/rela/searchemployee.jsp 2 Dec 2003 09:12:30 -0000
@@ -3,14 +3,14 @@
%>
<%@ taglib uri="/WEB-INF/tld/html.tld" prefix="html" %>
-<html:document type="searchscreen" title="Medewerkers" entity="employee">
+<html:document type="searchscreen" title="Zoek medewerker" entity="employee">
<html:head>
</html:head>
<html:body debug="false" dataSource="request" left="10" >
- <html:flashHeader height="30" right="0" headerText="Aankoop module"/>
+ <html:flashHeader height="30" right="0" headerText="Zoek medewerkers"/>
<html:spacer />
Index: web/WEB-INF/jsp/forms/rela/searchperson.jsp
===================================================================
RCS file: /var/cvs/crm/web/WEB-INF/jsp/forms/rela/searchperson.jsp,v
retrieving revision 1.2
diff -b -u -r1.2 searchperson.jsp
--- web/WEB-INF/jsp/forms/rela/searchperson.jsp 26 Nov 2003 16:46:41 -0000 1.2
+++ web/WEB-INF/jsp/forms/rela/searchperson.jsp 2 Dec 2003 09:12:30 -0000
@@ -10,7 +10,7 @@
<html:body debug="false" dataSource="request" left="10" >
- <html:flashHeader height="30" right="0" headerText="Personen"/>
+ <html:flashHeader height="30" right="0" headerText="Zoek Personen"/>
<html:spacer />
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
