Skip to content

Commit

Permalink
MONDRIAN: Integrate @13195 to mondrian-3.1 branch: comply with latest…
Browse files Browse the repository at this point in the history 
… checkFile.

[git-p4: depot-paths = "//open/mondrian-release/3.1/": change = 13196]
  • Loading branch information
@julianhyde
julianhyde committed Nov 28, 2009
1 parent e25673b commit 61c79c0
Show file tree
Hide file tree
Showing 8 changed files with 139 additions and 140 deletions.
120 changes: 60 additions & 60 deletions src/main/mondrian/olap/Scanner.java
View file
Expand Up @@ -234,67 +234,67 @@ private void initReswords() {
// awk '{printf "initResword(%20s,%c%s%c);",$1,34,$1,34}'
m_resWordsTable = new Hashtable<String, Integer>();
iMaxResword = 0;
// initResword(ParserSym.ALL , "ALL");
initResword(ParserSym.AND , "AND");
initResword(ParserSym.AS , "AS");
// initResword(ParserSym.ASC , "ASC");
initResword(ParserSym.AXIS , "AXIS");
// initResword(ParserSym.BACK_COLOR , "BACK_COLOR");
// initResword(ParserSym.BASC , "BASC");
// initResword(ParserSym.BDESC , "BDESC");
// initResword(ParserSym.ALL, "ALL");
initResword(ParserSym.AND, "AND");
initResword(ParserSym.AS, "AS");
// initResword(ParserSym.ASC, "ASC");
initResword(ParserSym.AXIS, "AXIS");
// initResword(ParserSym.BACK_COLOR, "BACK_COLOR");
// initResword(ParserSym.BASC, "BASC");
// initResword(ParserSym.BDESC, "BDESC");
// CAST is a mondrian extension
initResword(ParserSym.CAST , "CAST");
initResword(ParserSym.CASE , "CASE");
initResword(ParserSym.CELL , "CELL");
// initResword(ParserSym.CELL_ORDINAL , "CELL_ORDINAL");
initResword(ParserSym.CHAPTERS , "CHAPTERS");
// initResword(ParserSym.CHILDREN , "CHILDREN");
initResword(ParserSym.COLUMNS , "COLUMNS");
// initResword(ParserSym.DESC , "DESC");
initResword(ParserSym.DIMENSION , "DIMENSION");
initResword(ParserSym.ELSE , "ELSE");
initResword(ParserSym.EMPTY , "EMPTY");
initResword(ParserSym.END , "END");
// initResword(ParserSym.FIRSTCHILD , "FIRSTCHILD");
// initResword(ParserSym.FIRSTSIBLING , "FIRSTSIBLING");
// initResword(ParserSym.FONT_FLAGS , "FONT_FLAGS");
// initResword(ParserSym.FONT_NAME , "FONT_NAME");
// initResword(ParserSym.FONT_SIZE , "FONT_SIZE");
// initResword(ParserSym.FORE_COLOR , "FORE_COLOR");
// initResword(ParserSym.FORMATTED_VALUE , "FORMATTED_VALUE");
// initResword(ParserSym.FORMAT_STRING , "FORMAT_STRING");
initResword(ParserSym.FROM , "FROM");
initResword(ParserSym.IS , "IS");
initResword(ParserSym.IN , "IN");
// initResword(ParserSym.LAG , "LAG");
// initResword(ParserSym.LASTCHILD , "LASTCHILD");
// initResword(ParserSym.LASTSIBLING , "LASTSIBLING");
// initResword(ParserSym.LEAD , "LEAD");
initResword(ParserSym.MATCHES , "MATCHES");
initResword(ParserSym.MEMBER , "MEMBER");
// initResword(ParserSym.MEMBERS , "MEMBERS");
// initResword(ParserSym.NEXTMEMBER , "NEXTMEMBER");
initResword(ParserSym.NON , "NON");
initResword(ParserSym.NOT , "NOT");
initResword(ParserSym.NULL , "NULL");
initResword(ParserSym.ON , "ON");
initResword(ParserSym.OR , "OR");
initResword(ParserSym.PAGES , "PAGES");
// initResword(ParserSym.PARENT , "PARENT");
// initResword(ParserSym.PREVMEMBER , "PREVMEMBER");
initResword(ParserSym.PROPERTIES , "PROPERTIES");
// initResword(ParserSym.RECURSIVE , "RECURSIVE");
initResword(ParserSym.ROWS , "ROWS");
initResword(ParserSym.SECTIONS , "SECTIONS");
initResword(ParserSym.SELECT , "SELECT");
initResword(ParserSym.SET , "SET");
// initResword(ParserSym.SOLVE_ORDER , "SOLVE_ORDER");
initResword(ParserSym.THEN , "THEN");
// initResword(ParserSym.VALUE , "VALUE");
initResword(ParserSym.WHEN , "WHEN");
initResword(ParserSym.WHERE , "WHERE");
initResword(ParserSym.WITH , "WITH");
initResword(ParserSym.XOR , "XOR");
initResword(ParserSym.CAST, "CAST");
initResword(ParserSym.CASE, "CASE");
initResword(ParserSym.CELL, "CELL");
// initResword(ParserSym.CELL_ORDINAL, "CELL_ORDINAL");
initResword(ParserSym.CHAPTERS, "CHAPTERS");
// initResword(ParserSym.CHILDREN, "CHILDREN");
initResword(ParserSym.COLUMNS, "COLUMNS");
// initResword(ParserSym.DESC, "DESC");
initResword(ParserSym.DIMENSION, "DIMENSION");
initResword(ParserSym.ELSE, "ELSE");
initResword(ParserSym.EMPTY, "EMPTY");
initResword(ParserSym.END, "END");
// initResword(ParserSym.FIRSTCHILD, "FIRSTCHILD");
// initResword(ParserSym.FIRSTSIBLING, "FIRSTSIBLING");
// initResword(ParserSym.FONT_FLAGS, "FONT_FLAGS");
// initResword(ParserSym.FONT_NAME, "FONT_NAME");
// initResword(ParserSym.FONT_SIZE, "FONT_SIZE");
// initResword(ParserSym.FORE_COLOR, "FORE_COLOR");
// initResword(ParserSym.FORMATTED_VALUE, "FORMATTED_VALUE");
// initResword(ParserSym.FORMAT_STRING, "FORMAT_STRING");
initResword(ParserSym.FROM, "FROM");
initResword(ParserSym.IS, "IS");
initResword(ParserSym.IN, "IN");
// initResword(ParserSym.LAG, "LAG");
// initResword(ParserSym.LASTCHILD, "LASTCHILD");
// initResword(ParserSym.LASTSIBLING, "LASTSIBLING");
// initResword(ParserSym.LEAD, "LEAD");
initResword(ParserSym.MATCHES, "MATCHES");
initResword(ParserSym.MEMBER, "MEMBER");
// initResword(ParserSym.MEMBERS, "MEMBERS");
// initResword(ParserSym.NEXTMEMBER, "NEXTMEMBER");
initResword(ParserSym.NON, "NON");
initResword(ParserSym.NOT, "NOT");
initResword(ParserSym.NULL, "NULL");
initResword(ParserSym.ON, "ON");
initResword(ParserSym.OR, "OR");
initResword(ParserSym.PAGES, "PAGES");
// initResword(ParserSym.PARENT, "PARENT");
// initResword(ParserSym.PREVMEMBER, "PREVMEMBER");
initResword(ParserSym.PROPERTIES, "PROPERTIES");
// initResword(ParserSym.RECURSIVE, "RECURSIVE");
initResword(ParserSym.ROWS, "ROWS");
initResword(ParserSym.SECTIONS, "SECTIONS");
initResword(ParserSym.SELECT, "SELECT");
initResword(ParserSym.SET, "SET");
// initResword(ParserSym.SOLVE_ORDER, "SOLVE_ORDER");
initResword(ParserSym.THEN, "THEN");
// initResword(ParserSym.VALUE, "VALUE");
initResword(ParserSym.WHEN, "WHEN");
initResword(ParserSym.WHERE, "WHERE");
initResword(ParserSym.WITH, "WITH");
initResword(ParserSym.XOR, "XOR");

m_aResWords = new String[iMaxResword + 1];
Enumeration<String> e = m_resWordsTable.keys();
Expand Down
2 changes: 1 addition & 1 deletion src/main/mondrian/tui/XmlUtil.java
View file
Expand Up @@ -983,7 +983,7 @@ public static void validate(
String docStr,
String schemaLocationPropertyValue,
EntityResolver resolver)
throws IOException ,
throws IOException,
SAXException
{
if (resolver == null) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/mondrian/tui/XmlaSupport.java
View file
Expand Up @@ -959,8 +959,8 @@ public static boolean validateNodes(Node[] nodes)
rootNode.removeChild(schemaNode);

// Convert nodes to Documents.
Document schemaDoc = XmlUtil.newDocument(schemaNode , true);
Document dataDoc = XmlUtil.newDocument(rootNode , true);
Document schemaDoc = XmlUtil.newDocument(schemaNode, true);
Document dataDoc = XmlUtil.newDocument(rootNode, true);

String xmlns = XmlUtil.getNamespaceAttributeValue(dataDoc);
String schemaLocationPropertyValue = xmlns + ' ' + "xmlschema";
Expand Down

0 comments on commit 61c79c0

Please sign in to comment.