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

ICU-2055 update comparison charts to include references

Browse Source 
X-SVN-Rev: 16501
This commit is contained in:
Steven R. Loomis 2004-10-15 01:54:10 +00:00
parent 05c0b046ba
commit ef0f67070e
2 changed files with 95 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
icu4j/src/com/ibm/icu/dev/tool/cldr/LDMLComparator.java
View File

@ -127,13 +127,13 @@ public class LDMLComparator {
public static void main(String[] args){ public static void main(String[] args){
LDMLComparator comparator = new LDMLComparator(); LDMLComparator comparator = new LDMLComparator();
comparator.processArgs(args); comparator.processArgs(args);
} }
Hashtable optionTable = new Hashtable(); Hashtable optionTable = new Hashtable();
private String sourceFolder = "."; private String sourceFolder = ".";
private String destFolder = "."; private String destFolder = ".";
private String localeStr; private String localeStr;
private String ourCvsVersion = "";
private Calendar cal = Calendar.getInstance(); private Calendar cal = Calendar.getInstance();
private Hashtable colorHash = new Hashtable(); private Hashtable colorHash = new Hashtable();
private String goldFileName; private String goldFileName;
@ -169,6 +169,7 @@ public class LDMLComparator {
String parentNode; String parentNode;
String type; String type;
Hashtable platformData = new Hashtable(); Hashtable platformData = new Hashtable();
String referenceUrl;
} }
//PN added //PN added
@ -269,11 +270,28 @@ public class LDMLComparator {
if((m_totalCount == 0) && m_Vetting) { // only optional for vetting. if((m_totalCount == 0) && m_Vetting) { // only optional for vetting.
//System.out.println("INFO: no file created (nothing to write..) " + fileName); //System.out.println("INFO: no file created (nothing to write..) " + fileName);
} else { } else {
ourCvsVersion = "";
getCvsVersion();
OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(fileName),encoding); OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(fileName),encoding);
System.out.println("INFO: Writing: " + fileName + "\t(" + m_totalCount + " items)"); System.out.println("INFO: Writing: " + fileName + "\t(" + m_totalCount + " items)");
PrintWriter writer = new PrintWriter(os); PrintWriter writer = new PrintWriter(os);
printHTML(writer, localeStr); printHTML(writer, localeStr);
{
ULocale ourLocale = new ULocale(localeStr);
String idxFileName = destFolder+File.separator+ourLocale.getDisplayLanguage()+"_"+ourLocale.getDisplayCountry()+"_"+localeStr+".idx";
OutputStreamWriter is = new OutputStreamWriter(new FileOutputStream(idxFileName),"utf-8");
PrintWriter indexwriter = new PrintWriter(is);
indexwriter.println("<tr>");
indexwriter.println(" <td>" +
localeStr +
"</td>");
indexwriter.println(" <td><a href=\"" + localeStr+".html" + "\">" +
ourLocale.getDisplayName() + "</a></td>");
indexwriter.println(" <td>" + m_totalCount + "</td>");
indexwriter.println(" <td>" + ourCvsVersion + "</td>");
indexwriter.println("</tr>");
is.close();
}
} }
} }
}catch(Exception e) }catch(Exception e)
@ -702,6 +720,9 @@ public class LDMLComparator {
"<input type=submit value=\"" + "Test" + "\"/>" + "<input type=submit value=\"" + "Test" + "\"/>" +
"</form>"); "</form>");
} }
if(m_Vetting && element.referenceUrl != null) {
writer.print("<br><div align='right'><a href=\"" + element.referenceUrl + "\"><i>(Ref)</i></a></div>");
}
writer.print("</td>"); writer.print("</td>");
if(altText!=null) { if(altText!=null) {
writer.print(" <td bgcolor="+ALT_COLOR+">"+altText); writer.print(" <td bgcolor="+ALT_COLOR+">"+altText);
@ -786,6 +807,9 @@ public class LDMLComparator {
"<a href=\"http://oss.software.ibm.com/cgi-bin/icu/lx/en/?_="+localeStr+"\">Demo</a>, "+ "<a href=\"http://oss.software.ibm.com/cgi-bin/icu/lx/en/?_="+localeStr+"\">Demo</a>, "+
"<a href=\"./index.html\">Main and About</a>, "+ "<a href=\"./index.html\">Main and About</a>, "+
"</b></p>\n"); "</b></p>\n");
if((ourCvsVersion!=null) && (ourCvsVersion.length()>0)) {
writer.println("<h3><tt>"+localeStr + ".xml version " + ourCvsVersion + "</tt></h3>");
}
writer.print( " <table>\n"); writer.print( " <table>\n");
} }
@ -952,8 +976,13 @@ public class LDMLComparator {
} }
private void addElement(String childNode, String parentNode, String id, String index, private final void addElement(String childNode, String parentNode, String id, String index,
String platformValue, String platformName){ String platformValue, String platformName){
addElement(childNode,parentNode,id,index,platformValue,platformName,null);
}
private void addElement(String childNode, String parentNode, String id, String index,
String platformValue, String platformName, String referenceUrl){
m_totalCount++; m_totalCount++;
Object obj = compareMap.get(id); Object obj = compareMap.get(id);
CompareElement element; CompareElement element;
@ -963,6 +992,7 @@ public class LDMLComparator {
element.index = index; element.index = index;
element.parentNode = parentNode; element.parentNode = parentNode;
element.node = childNode; element.node = childNode;
element.referenceUrl = referenceUrl;
// add the element to the compare map // add the element to the compare map
compareMap.put(id, element); compareMap.put(id, element);
}else{ }else{
@ -1024,24 +1054,32 @@ public class LDMLComparator {
private boolean extractMergeData(Node node,String key, boolean parentDraft){ private boolean extractMergeData(Node node,String key, boolean parentDraft){
Node childOfSource; Node childOfSource;
for(childOfSource = node.getFirstChild(); childOfSource != null; childOfSource = childOfSource.getNextSibling()) { for(childOfSource = node.getFirstChild(); childOfSource != null; childOfSource = childOfSource.getNextSibling()) {
if (childOfSource.getNodeType() != Node.ELEMENT_NODE) { if (childOfSource.getNodeType() != Node.ELEMENT_NODE) {
continue; continue;
} }
String altText = null; String altText = null;
Node altForChild = null; // String altReferenceUrl = null;
boolean subDraft = parentDraft; Node altForChild = null;
String childOfSourceName = childOfSource.getNodeName(); boolean subDraft = parentDraft;
//Ignore collation and special tags String childOfSourceName = childOfSource.getNodeName();
if(childOfSourceName.equals("collations")|| childOfSource.equals("special") //Ignore collation and special tags
if(childOfSourceName.equals("collations")|| childOfSource.equals("special")
|| childOfSourceName.indexOf(":")>-1){ || childOfSourceName.indexOf(":")>-1){
continue; continue;
} }
if(m_Vetting && LDMLUtilities.isNodeDraft(childOfSource)) { if(m_Vetting && LDMLUtilities.isNodeDraft(childOfSource)) {
if(!subDraft) { if(!subDraft) {
subDraft = true; subDraft = true;
} }
} }
String referenceUrl = null;
if(m_Vetting) {
referenceUrl = LDMLUtilities.getAttributeValue(childOfSource, LDMLConstants.REFERENCES);
if((referenceUrl!=null)&&(referenceUrl.length()==0)) {
referenceUrl = null;
}
}
if(m_Vetting) { /* Should this be always checked? */ if(m_Vetting) { /* Should this be always checked? */
String alt = LDMLUtilities.getAttributeValue(childOfSource, LDMLConstants.ALT); String alt = LDMLUtilities.getAttributeValue(childOfSource, LDMLConstants.ALT);
@ -1054,6 +1092,10 @@ public class LDMLComparator {
if(altForChild == null) { if(altForChild == null) {
throw new IllegalArgumentException("ERR: can't find a node like this one: " + childOfSource.toString()); throw new IllegalArgumentException("ERR: can't find a node like this one: " + childOfSource.toString());
} }
// altReferenceUrl = LDMLUtilities.getAttributeValue(altForChild, LDMLConstants.REFERENCES);
// if((altReferenceUrl!=null)&&(altReferenceUrl.length()==0)) {
// altReferenceUrl = null;
// }
} else if(subDraft) { /* don't care about nondraft */ } else if(subDraft) { /* don't care about nondraft */
String type = LDMLUtilities.getAttributeValue(childOfSource, LDMLConstants.TYPE); String type = LDMLUtilities.getAttributeValue(childOfSource, LDMLConstants.TYPE);
if(type==null) { if(type==null) {
@ -1230,18 +1272,18 @@ public class LDMLComparator {
if(!index.equals("")){ if(!index.equals("")){
if(!index.equals(nodeValue) && !index.equals("Fallback")){ if(!index.equals(nodeValue) && !index.equals("Fallback")){
if(!m_Vetting || subDraft) { if(!m_Vetting || subDraft) {
addElement(childNodeName, parentNodeName, id, index, nodeValue, key); addElement(childNodeName, parentNodeName, id, index, nodeValue, key,referenceUrl);
if(altText!=null) { if(altText!=null) {
addElement(childNodeName, parentNodeName, id, index, altText, "ALT"); addElement(childNodeName, parentNodeName, id, index, altText, "ALT",null /* altReferenceUrl */);
} }
} }
} }
}else{ }else{
if(!type.equals(nodeValue) && !type.equals("Fallback")){ if(!type.equals(nodeValue) && !type.equals("Fallback")){
if(!m_Vetting || subDraft) { if(!m_Vetting || subDraft) {
addElement(childNodeName, parentNodeName, id, type, nodeValue, key); addElement(childNodeName, parentNodeName, id, type, nodeValue, key,referenceUrl);
if(altText!=null) { if(altText!=null) {
addElement(childNodeName, parentNodeName, id, index, altText, "ALT"); addElement(childNodeName, parentNodeName, id, index, altText, "ALT",null /* altReferenceUrl */);
} }
} }
} }
@ -1271,7 +1313,7 @@ public class LDMLComparator {
if(altForChild!=null) { if(altForChild!=null) {
subAltText="?"; subAltText="?";
System.err.println(parentNodeName + "/" + childNodeName + " alt?? : " + altText); System.err.println(parentNodeName + "/" + childNodeName + " alt?? : " + altText);
throw new IllegalArgumentException("UNKNOWN ALT SUBTAG THINGY + " + parentNodeName + "/" + childNodeName + " alt?? : " + altText + " not " + subNodeValue); throw new IllegalArgumentException("UNKNOWN ALT SUBTAG + " + parentNodeName + "/" + childNodeName + " alt?? : " + altText + " not " + subNodeValue);
} }
if(!index.equals("")){ if(!index.equals("")){
addElement(childNodeName, parentNodeName, id, index, subNodeValue, key); addElement(childNodeName, parentNodeName, id, index, subNodeValue, key);
@ -1743,4 +1785,38 @@ public class LDMLComparator {
writer.print(" </table>\n"); writer.print(" </table>\n");
} }
private void getCvsVersion()
{
// private String localeStr;
// private String ourCvsVersion = null;
// sourceFolder
// localeStr = goldFileName.substring(goldFileName.lastIndexOf(File.separatorChar)+1,goldFileName.lastIndexOf('.'));
int index = goldFileName.lastIndexOf(File.separatorChar);
String sourceDir = goldFileName.substring(0, index);
File entriesFile = new File(sourceDir + File.separatorChar + "CVS","Entries");
if(!entriesFile.exists() || !entriesFile.canRead()) {
System.out.println("Can't read, won't try to get CVS " + entriesFile.toString());
return;
}
try {
BufferedReader r = new BufferedReader(new FileReader(entriesFile.getPath()));
String s;
while((s=r.readLine())!=null) {
String lookFor = "/"+localeStr+".xml/";
if(s.startsWith(lookFor)) {
String ver = s.substring(lookFor.length());
ver = ver.substring(0,ver.indexOf('/'));
ourCvsVersion = ver;
}
}
r.close();
} catch ( Throwable th ) {
System.err.println(th.toString() + " trying to read CVS Entries file " + entriesFile.getPath());
return;
}
}
} //end of class definition/declaration } //end of class definition/declaration

1
icu4j/src/com/ibm/icu/dev/tool/cldr/LDMLConstants.java
View File

@ -28,6 +28,7 @@ public class LDMLConstants {
public static final String REGISTRY = "registry"; public static final String REGISTRY = "registry";
public static final String ALT = "alt"; public static final String ALT = "alt";
public static final String DRAFT = "draft"; public static final String DRAFT = "draft";
public static final String REFERENCES = "references";
public static final String PROPOSED = "proposed"; public static final String PROPOSED = "proposed";
public static final String ALIAS = "alias"; public static final String ALIAS = "alias";
public static final String VERSION = "version"; public static final String VERSION = "version";