AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-3186 bugs, error checking, ..

Browse Source 
X-SVN-Rev: 16359
This commit is contained in:
Steven R. Loomis 2004-09-24 23:43:10 +00:00
parent 3e2694d596
commit 81785dea63
3 changed files with 73 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4j/src/com/ibm/icu/dev/tool/cldr/ICUResourceWriter.java
View File

@ -49,6 +49,10 @@ public class ICUResourceWriter {
Resource next;
public StringBuffer escapeSyntaxChars(String val){
// escape the embedded quotes
if(val==null) {
System.err.println("Resource.escapeSyntaxChars: warning, resource '" + name + "': string value is NULL - assuming 'empty'");
return new StringBuffer("");
}
char[] str = val.toCharArray();
StringBuffer result = new StringBuffer();
for(int i=0; i<str.length; i++){

51
icu4j/src/com/ibm/icu/dev/tool/cldr/LDML2ICUConverter.java
View File

@ -99,7 +99,7 @@ public class LDML2ICUConverter {
try{
remainingArgc = UOption.parseArgs(args, options);
}catch (Exception e){
System.err.println("ERROR: "+ e.toString());
System.err.println("ERROR: (parsing args): "+ e.toString());
e.printStackTrace();
usage();
}
@ -156,7 +156,7 @@ public class LDML2ICUConverter {
}
}catch (Throwable se) {
System.err.println(fileName + ": ERROR: " + se.toString());
System.err.println(fileName + ": ERROR: (parsing supplemental) " + se.toString());
se.printStackTrace();
System.exit(1);
}
@ -187,9 +187,11 @@ public class LDML2ICUConverter {
locName = args[i];
System.out.println("INFO: Parsing LDML document for: " + specialsDir+File.separator+ args[i]);
specialsDoc = LDMLUtilities.parseAndResolveAliases(args[i], specialsDir, true);
int index = locName.indexOf(".xml");
if(index > -1){
locName = locName.substring(0,index);
if(specialsDoc != null) {
int index = locName.indexOf(".xml");
if(index > -1){
locName = locName.substring(0,index);
}
}
/*
try{
@ -263,7 +265,7 @@ public class LDML2ICUConverter {
writeAliasedResource();
}
catch (Throwable se) {
System.err.println(xmlfileName + ": ERROR: " + se.toString());
System.err.println(xmlfileName + ": ERROR: (parsing and writing) " + se.toString());
se.printStackTrace();
System.exit(1);
}
@ -618,16 +620,24 @@ public class LDML2ICUConverter {
}
// now fetch the specials and append to the real bundle
if(specialsDir!=null && ULocale.getCountry(locName).equals("")){
ICUResourceWriter.Resource res = parseSpecials(specialsDoc);
if(res!=null){
if(current == null){
table.first = res;
current = findLast(res);
}else{
current.next = res;
current = findLast(res);
if(specialsDoc == null) {
System.err.println("Could not open special bundle - no specials written.");
} else {
if(table.comment == null) {
table.comment = "";
}
ICUResourceWriter.Resource res = parseSpecials(specialsDoc);
table.comment = table.comment + " ICU <specials> source: " + specialsDir + File.separator + locName + ".xml";
if(res!=null){
if(current == null){
table.first = res;
current = findLast(res);
}else{
current.next = res;
current = findLast(res);
}
res = null;
}
res = null;
}
}
return table;
@ -690,6 +700,9 @@ public class LDML2ICUConverter {
ICUResourceWriter.ResourceString str = new ICUResourceWriter.ResourceString();
str.val = LDMLUtilities.getAttributeValue(node, LDMLConstants.NUMBER);
str.name = (String)keyNameMap.get(LDMLConstants.VERSION);
if(LDMLUtilities.isNodeDraft(root)) { // x for experimental
str.val = "x" + str.val;
}
res = str;
}else if(name.equals(LDMLConstants.LANGUAGE)||
name.equals(LDMLConstants.SCRIPT) ||
@ -2861,7 +2874,7 @@ public class LDML2ICUConverter {
System.err.println(sourceFileName + ": INFO: Creating ICU ResourceBundle: "+outputFileName);
//TODO: fix me
writeHeader(writer,sourceFileName);
ICUResourceWriter.Resource current = set;
while(current!=null){
current.sort();
@ -2877,8 +2890,10 @@ public class LDML2ICUConverter {
writer.flush();
writer.close();
} catch (Exception ie) {
System.err.println(sourceFileName + ": ERROR :" + ie.toString());
return;
System.err.println(sourceFileName + ": ERROR (writing resource) :" + ie.toString());
ie.printStackTrace();
System.exit(1);
return; // NOTREACHED
}
}

37
icu4j/src/com/ibm/icu/dev/tool/cldr/LDMLUtilities.java
View File

@ -752,6 +752,30 @@ public class LDMLUtilities {
throw new RuntimeException(ex.getMessage());
}
}
public static final boolean isAlternate(Node node){
NamedNodeMap attributes = node.getAttributes();
Node attr = attributes.getNamedItem(LDMLConstants.ALT);
if(attr!=null){
return true;
}
return false;
}
private static final Node getNonaltNode(NodeList list /*, StringBuffer xpath*/){
// A nonalt node is one which .. does not have alternate
// attribute set
Node node =null;
for(int i =0; i<list.getLength(); i++){
node = list.item(i);
if(/*!isDraft(node, xpath)&& */!isAlternate(node)){
return node;
}
}
return null;
}
/**
* Fetches the node from the document that matches the given xpath.
* The context namespace node is required if the xpath contains
@ -790,7 +814,18 @@ public class LDMLUtilities {
int len = nl.getLength();
//TODO watch for attribute "alt"
if(len>1){
throw new IllegalArgumentException("The XPATH returned more than 1 node!. Check XPATH: "+xpath);
Node best = getNonaltNode(nl);
if(best != null) {
System.err.println("Chose best node from " + xpath);
return best;
}
/* else complain */
String all = "";
int i;
for(i=0;i<len;i++) {
all = all + ", " + nl.item(i);
}
throw new IllegalArgumentException("The XPATH returned more than 1 node!. Check XPATH: "+xpath + " = " + all);
}
if(len==0){
return null;