idrs-commit Mailing List for Internet Document and Report Server (Page 13)
Brought to you by:
bigman921
Menu
▾
▴
idrs-commit — List For CVS Commit Mails
You can subscribe to this list here.
| 2002 |
Jan
(113) |
Feb
(34) |
Mar
(38) |
Apr
(63) |
May
|
Jun
|
Jul
|
Aug
(40) |
Sep
(26) |
Oct
(4) |
Nov
(5) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(13) |
Feb
(15) |
Mar
(21) |
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(71) |
Sep
(4) |
Oct
|
Nov
|
Dec
|
|
From: Marc B. <big...@us...> - 2002-03-04 23:05:39
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro
In directory usw-pr-cvs1:/tmp/cvs-serv28790/src/net/sourceforge/idrs/deploy/macro
Modified Files:
MacroToXML.java MacroToXMLHandler.java
Log Message:
Completed initial xml compilation system
Index: MacroToXML.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro/MacroToXML.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MacroToXML.java 25 Jan 2002 14:49:03 -0000 1.13
--- MacroToXML.java 4 Mar 2002 23:05:35 -0000 1.14
***************
*** 35,43 ****
boolean lastOwnLine;
boolean inTag;
!
Stack writeStack;
!
String currentTagName;
!
/**
*Constructor, loads transoformation xml document
--- 35,43 ----
boolean lastOwnLine;
boolean inTag;
! String rmlNS;
Stack writeStack;
!
String currentTagName;
!
/**
*Constructor, loads transoformation xml document
***************
*** 46,50 ****
*@param isFile Identifies if xmlSrc is the xml as a string or a path to the xml file
*/
! public MacroToXML(String parser, String xmlSrc, boolean isFile) throws Exception {
ownLine = false;
inTag = false;
--- 46,50 ----
*@param isFile Identifies if xmlSrc is the xml as a string or a path to the xml file
*/
! public MacroToXML(String parser, String xmlSrc, boolean isFile,String rmlNS) throws Exception {
ownLine = false;
inTag = false;
***************
*** 56,62 ****
lastOwnLine = false;
writeStack = new Stack();
!
XMLReader xmlParser = XMLReaderFactory.createXMLReader(parser);
!
InputSource in;
info = new MacroToXMLHandler();
--- 56,64 ----
lastOwnLine = false;
writeStack = new Stack();
! this.rmlNS=rmlNS;
!
!
XMLReader xmlParser = XMLReaderFactory.createXMLReader(parser);
!
InputSource in;
info = new MacroToXMLHandler();
***************
*** 67,74 ****
in = new InputSource(new StringReader(xmlSrc));
}
xmlParser.setContentHandler(info);
xmlParser.parse(in);
}
!
/**
*Sets the rml-macro source as a string
--- 69,77 ----
in = new InputSource(new StringReader(xmlSrc));
}
+
xmlParser.setContentHandler(info);
xmlParser.parse(in);
}
!
/**
*Sets the rml-macro source as a string
***************
*** 78,82 ****
this.rmlSrc = rml;
}
!
/**
*Sets the writer where the RML-XML will be written to
--- 81,85 ----
this.rmlSrc = rml;
}
!
/**
*Sets the writer where the RML-XML will be written to
***************
*** 85,90 ****
public void setWriter(Writer out) throws IOException {
this.out = out;
}
!
/**
*Transforms the RML-Macro page into an RML-XML page
--- 88,94 ----
public void setWriter(Writer out) throws IOException {
this.out = out;
+
}
!
/**
*Transforms the RML-Macro page into an RML-XML page
***************
*** 93,109 ****
int begin=0,end=0,tagEnd;
boolean isScript;
!
String curr = "", tag="";
end = rmlSrc.indexOf("<",begin);
!
while (end != -1) {
!
isScript = isScriptTag(end);
curr = rmlSrc.substring(begin,end);
!
//debug
System.out.println("text : " + curr);
!
!
if (isScript) {
outText(curr);
--- 97,113 ----
int begin=0,end=0,tagEnd;
boolean isScript;
! out.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
String curr = "", tag="";
end = rmlSrc.indexOf("<",begin);
!
while (end != -1) {
!
isScript = isScriptTag(end);
curr = rmlSrc.substring(begin,end);
!
//debug
System.out.println("text : " + curr);
!
!
if (isScript) {
outText(curr);
***************
*** 112,120 ****
else {
tagEnd = readTag(end);
!
tag = rmlSrc.substring(end, tagEnd);
!
System.out.print("tag : " + tag);
!
if (isRMLTag(tag)) {
outText(curr);
--- 116,124 ----
else {
tagEnd = readTag(end);
!
tag = rmlSrc.substring(end, tagEnd);
!
System.out.print("tag : " + tag);
!
if (isRMLTag(tag)) {
outText(curr);
***************
*** 126,136 ****
}
}
!
begin = tagEnd;
end = rmlSrc.indexOf("<",begin);
}
!
}
!
/**
*Determines if current tag is a script tag
--- 130,140 ----
}
}
!
begin = tagEnd;
end = rmlSrc.indexOf("<",begin);
}
!
}
!
/**
*Determines if current tag is a script tag
***************
*** 140,144 ****
return rmlSrc.charAt(begin + 1) == info.getScriptChar();
}
!
/**
*Writes a fully xml compatable version of a script
--- 144,148 ----
return rmlSrc.charAt(begin + 1) == info.getScriptChar();
}
!
/**
*Writes a fully xml compatable version of a script
***************
*** 154,190 ****
String tmpLine,whiteSpace;
StringTokenizer tok;
!
tag = "<" + info.getNameSpace() + ":" + (isEcho ? info.getEchoScriptTag() : info.getScriptTag()) + ">";
out.write(tag);
! if (isEcho) {
! out.write(script);
! }
! else {
! tmpLine = script.substring(1,script.indexOf('\n'));
! script = script.substring(script.indexOf('\n') + 1);
! taglen = tag.length() + ((String) "</" + info.getNameSpace() + ":" + info.getTextTag() + ">").length();
! spaceBegin = rmlSrc.lastIndexOf('\n',begin);
! //whiteSpace = rmlSrc.substring(spaceBegin + 1,begin);
! whiteSpace = "";
!
! for (int i=0;i<taglen;i++)
! whiteSpace += " ";
!
! tok = new StringTokenizer(script,"\n",false);
!
! out.write(tmpLine + "\n");
! while (tok.hasMoreTokens()) {
! out.write(whiteSpace + tok.nextToken() + "\n");
! }
! }
out.write("</" + info.getNameSpace() + ":");
out.write( isEcho ? info.getEchoScriptTag() : info.getScriptTag());
out.write(">");
!
return end + 2;
}
!
/**
*Writes text apropriatly, either with text tags or without them
--- 158,176 ----
String tmpLine,whiteSpace;
StringTokenizer tok;
!
tag = "<" + info.getNameSpace() + ":" + (isEcho ? info.getEchoScriptTag() : info.getScriptTag()) + ">";
out.write(tag);
+
! out.write(script);
+
out.write("</" + info.getNameSpace() + ":");
out.write( isEcho ? info.getEchoScriptTag() : info.getScriptTag());
out.write(">");
!
return end + 2;
}
!
/**
*Writes text apropriatly, either with text tags or without them
***************
*** 194,210 ****
boolean hasCR = (txt.indexOf("\n") != -1);
String splitText;
!
if (txt.length() == 0) return;
!
!
!
!
if (this.ownLine) {
if (shouldWrite() && hasCR && !lastOwnLine)
out.write("<" + info.getNameSpace() + ":" + info.getTextTag() + ">");
!
if (hasCR) {
splitText = xmlEncode(txt.substring(0,txt.lastIndexOf('\n')));
! if (splitText.trim().length() != 0)
out.write(splitText);
}
--- 180,196 ----
boolean hasCR = (txt.indexOf("\n") != -1);
String splitText;
!
if (txt.length() == 0) return;
!
!
!
!
if (this.ownLine) {
if (shouldWrite() && hasCR && !lastOwnLine)
out.write("<" + info.getNameSpace() + ":" + info.getTextTag() + ">");
!
if (hasCR) {
splitText = xmlEncode(txt.substring(0,txt.lastIndexOf('\n')));
! if (splitText.trim().length() != 0)
out.write(splitText);
}
***************
*** 212,222 ****
out.write(xmlEncode("\n" + txt));
}
!
if (shouldWrite() && hasCR && !lastOwnLine)
out.write("</" + info.getNameSpace() + ":" + info.getTextTag() + ">");
!
if (hasCR)
out.write(xmlEncode(txt.substring(txt.lastIndexOf('\n'))));
!
}
else {
--- 198,208 ----
out.write(xmlEncode("\n" + txt));
}
!
if (shouldWrite() && hasCR && !lastOwnLine)
out.write("</" + info.getNameSpace() + ":" + info.getTextTag() + ">");
!
if (hasCR)
out.write(xmlEncode(txt.substring(txt.lastIndexOf('\n'))));
!
}
else {
***************
*** 225,244 ****
this.lastOwnLine = false;
}
!
if (shouldWrite())
out.write("<" + info.getNameSpace() + ":" + info.getTextTag() + ">");
!
out.write(xmlEncode(txt));
!
if (shouldWrite())
out.write("</" + info.getNameSpace() + ":" + info.getTextTag() + ">");
}
!
!
lookLastTag = false;
inSimple = false;
}
!
!
/**
*Reads rmlSrc for position of the end of the current tag
--- 211,230 ----
this.lastOwnLine = false;
}
!
if (shouldWrite())
out.write("<" + info.getNameSpace() + ":" + info.getTextTag() + ">");
!
out.write(xmlEncode(txt));
!
if (shouldWrite())
out.write("</" + info.getNameSpace() + ":" + info.getTextTag() + ">");
}
!
!
lookLastTag = false;
inSimple = false;
}
!
!
/**
*Reads rmlSrc for position of the end of the current tag
***************
*** 248,252 ****
return rmlSrc.indexOf(">", begin)+1;
}
!
/**
*Determines if a tag is an RML tag
--- 234,238 ----
return rmlSrc.indexOf(">", begin)+1;
}
!
/**
*Determines if a tag is an RML tag
***************
*** 254,258 ****
*/
protected boolean isRMLTag(String tag) {
!
int begin=0, end=0,tmp;
char c;
--- 240,244 ----
*/
protected boolean isRMLTag(String tag) {
!
int begin=0, end=0,tmp;
char c;
***************
*** 260,266 ****
String tagName;
boolean isTag=false;
!
//writeText = isBody;
!
if (c == '/') {
begin = 2;
--- 246,252 ----
String tagName;
boolean isTag=false;
!
//writeText = isBody;
!
if (c == '/') {
begin = 2;
***************
*** 271,286 ****
inTag = false;
}
!
tmp = tag.indexOf(" ",begin);
if (tmp == -1) {
tmp = tag.indexOf(">",begin);
}
!
tagName = tag.substring(begin,tmp);
!
this.currentTagName=tagName;
!
isTag = info.isRMLTag(tagName.toLowerCase().trim());
!
if (isTag) {
this.ownLine = info.isTagOwnLine(tagName.toLowerCase().trim());
--- 257,272 ----
inTag = false;
}
!
tmp = tag.indexOf(" ",begin);
if (tmp == -1) {
tmp = tag.indexOf(">",begin);
}
!
tagName = tag.substring(begin,tmp);
!
this.currentTagName=tagName;
!
isTag = info.isRMLTag(tagName.toLowerCase().trim());
!
if (isTag) {
this.ownLine = info.isTagOwnLine(tagName.toLowerCase().trim());
***************
*** 290,295 ****
else {
this.inSimple = info.isTagSimple(tagName.toLowerCase().trim());
!
!
if (! writeStack.empty()) {
this.lastTagWrite = ((Boolean) writeStack.peek()).booleanValue();
--- 276,281 ----
else {
this.inSimple = info.isTagSimple(tagName.toLowerCase().trim());
!
!
if (! writeStack.empty()) {
this.lastTagWrite = ((Boolean) writeStack.peek()).booleanValue();
***************
*** 298,313 ****
this.lastTagWrite = false;
}
!
! this.lookLastTag = true;
writeStack.push(new Boolean(this.inSimple));
System.out.println("PUSH " + tagName);
popTag = false;
}
!
!
}
!
/*
!
if (isTag && (tagName.toLowerCase().trim().equalsIgnoreCase("body") || tagName.toLowerCase().trim().equalsIgnoreCase("head")))
if (inTag)
--- 284,299 ----
this.lastTagWrite = false;
}
!
! this.lookLastTag = ! this.inSimple;
writeStack.push(new Boolean(this.inSimple));
System.out.println("PUSH " + tagName);
popTag = false;
}
!
!
}
!
/*
!
if (isTag && (tagName.toLowerCase().trim().equalsIgnoreCase("body") || tagName.toLowerCase().trim().equalsIgnoreCase("head")))
if (inTag)
***************
*** 316,323 ****
isBody = true;
}*/
!
return isTag;
}
!
/**
*Writes the RML tag as full XML 1.0 tag
--- 302,309 ----
isBody = true;
}*/
!
return isTag;
}
!
/**
*Writes the RML tag as full XML 1.0 tag
***************
*** 332,352 ****
StringTokenizer tok;
String token;
!
!
tagName = this.currentTagName;
!
out.write("<" + ((c=='/') ? "/" : "") + info.getNameSpace() + ":");
!
begin = end;
end = tag.indexOf(">");
!
begin = tag.indexOf(tagName) + tagName.length();
atts = tag.substring(begin,end);
!
tok = new StringTokenizer(atts,"\"",false);
!
!
out.write(info.getCorrectRMLTagName(tagName));
!
while (tok.hasMoreTokens() && tok.countTokens() != 1) {
token = tok.nextToken();
--- 318,343 ----
StringTokenizer tok;
String token;
!
!
tagName = this.currentTagName;
!
out.write("<" + ((c=='/') ? "/" : "") + info.getNameSpace() + ":");
!
begin = end;
end = tag.indexOf(">");
!
begin = tag.indexOf(tagName) + tagName.length();
atts = tag.substring(begin,end);
!
tok = new StringTokenizer(atts,"\"",false);
!
!
out.write(info.getCorrectRMLTagName(tagName));
!
! if (tagName.toLowerCase().trim().equals("rml") && c != '/') {
! out.write(" xmlns:" + info.getNameSpace() + "=\"" + rmlNS + "\" ");
! }
!
!
while (tok.hasMoreTokens() && tok.countTokens() != 1) {
token = tok.nextToken();
***************
*** 363,367 ****
if (popTag) {
System.out.println("POP " + tagName);
! writeStack.pop();
popTag = false;
}
--- 354,359 ----
if (popTag) {
System.out.println("POP " + tagName);
! if (! writeStack.empty())
! writeStack.pop();
popTag = false;
}
Index: MacroToXMLHandler.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro/MacroToXMLHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MacroToXMLHandler.java 27 Feb 2002 23:56:31 -0000 1.7
--- MacroToXMLHandler.java 4 Mar 2002 23:05:35 -0000 1.8
***************
*** 40,44 ****
Attributes atts;
StringBuffer currBuff;
!
/**
* Constructor for MacroToXMLHandler
--- 40,44 ----
Attributes atts;
StringBuffer currBuff;
!
/**
* Constructor for MacroToXMLHandler
***************
*** 48,75 ****
rmlTags = new HashMap();
}
!
public void startDocument() throws SAXException {
!
}
!
public void endDocument() throws SAXException {
!
}
!
public void startElement(String namespaceURI, String loaclName, String rawName, Attributes atts) throws SAXException {
currBuff = new StringBuffer();
this.atts=atts;
}
!
public void endElement(String namespaceURI, String localName, String rawName) throws SAXException {
String name = localName.toLowerCase();
String rep;
!
if (name.equals(RML)) {
System.out.println("Found Tag : " + currBuff.toString().trim().toLowerCase());
! rep = atts.getValue(REPRESENT);
!
rmlTags.put(currBuff.toString().trim().toLowerCase(),new Tag(rep==null ? currBuff.toString().trim() : rep, Boolean.valueOf(atts.getValue(IS_SIMPLE)).booleanValue(), Boolean.valueOf(atts.getValue(OWN_LINE)).booleanValue()));
! }
else if (name.equals(TEXT_TAG)) {
textTag = currBuff.toString();
--- 48,79 ----
rmlTags = new HashMap();
}
!
public void startDocument() throws SAXException {
!
}
!
public void endDocument() throws SAXException {
!
}
!
public void startElement(String namespaceURI, String loaclName, String rawName, Attributes atts) throws SAXException {
currBuff = new StringBuffer();
this.atts=atts;
+ String rep = atts.getValue(REPRESENT);
+
}
!
public void endElement(String namespaceURI, String localName, String rawName) throws SAXException {
String name = localName.toLowerCase();
String rep;
!
if (name.equals(RML)) {
System.out.println("Found Tag : " + currBuff.toString().trim().toLowerCase());
! rep = atts.getValue(REPRESENT);
!
!
!
rmlTags.put(currBuff.toString().trim().toLowerCase(),new Tag(rep==null ? currBuff.toString().trim() : rep, Boolean.valueOf(atts.getValue(IS_SIMPLE)).booleanValue(), Boolean.valueOf(atts.getValue(OWN_LINE)).booleanValue()));
! }
else if (name.equals(TEXT_TAG)) {
textTag = currBuff.toString();
***************
*** 97,111 ****
}
}
!
public void characters(char[] ch, int start, int end) {
for (int i=start;i<start + end;i++) {
! currBuff.append(ch[i]);
}
}
!
/**
*Retrieves the character identified by the transformation document as the script character,
*the default is $ for <$ $>, <$= $>
! *@return
*/
public char getScriptChar() {
--- 101,115 ----
}
}
!
public void characters(char[] ch, int start, int end) {
for (int i=start;i<start + end;i++) {
! currBuff.append(ch[i]);
}
}
!
/**
*Retrieves the character identified by the transformation document as the script character,
*the default is $ for <$ $>, <$= $>
! *@return
*/
public char getScriptChar() {
|
|
From: Marc B. <big...@us...> - 2002-03-04 23:05:39
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units
In directory usw-pr-cvs1:/tmp/cvs-serv28790/src/net/sourceforge/idrs/deploy/compile/units
Modified Files:
Body.java Constructor.java Db.java Head.java Method.java
Object.java Repeat.java Rml.java SQL.java StoredProc.java
VarList.java
Added Files:
IfChange.java IfResults.java No.java Yes.java
Log Message:
Completed initial xml compilation system
--- NEW FILE: IfChange.java ---
/*
IfChange.java
Copyright (C) 2002 Marc Boorshtein
The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
you may not use this file except in compliance with the License. You may obtain a copy of the
License at http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
language governing rights and limitations under the License.
*/
/**
*Implements IfChange tag
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import java.util.*;
import net.sourceforge.idrs.core.report.*;
import net.sourceforge.idrs.deploy.compile.Compiler;
import net.sourceforge.idrs.deploy.compile.CompilerState;
public class IfChange extends net.sourceforge.idrs.deploy.compile.units.Body {
IfChangeChunk ifck;
/** Creates new IfChange */
public IfChange() {
}
/**
* allows for the execution of any wrap-up code at the hitting of the end tag
*/
public void seal() throws Exception {
if (! state.isLineNull())
state.sealLine();
Vector lines = state.popLines();
this.ifck.setLines(lines);
ifck.seal();
state.setLine(ifck);
state.sealLine();
}
/**
* allows for the compiler to work with the current state of the page compilation
*/
public void setState(CompilerState state) throws Exception {
this.state = state;
if (! state.isLineNull())
state.sealLine();
state.pushLines();
}
/**
* allows for a compiler to use the attributes of the calling tag
*/
public void setAttributes(Attributes atts) throws Exception {
this.atts = atts;
String fieldname = atts.getValue("field");
String dbname = fieldname.substring(0,fieldname.indexOf("."));
System.out.println("IfChange DbName : " + dbname);
fieldname = fieldname.substring(fieldname.indexOf(".") + 1);
System.out.println("IfChange FieldName : " + fieldname);
ifck = new IfChangeChunk(dbname,fieldname);
state.getReport().getBody().regIfChange(ifck);
}
}
--- NEW FILE: IfResults.java ---
/*
IfResults.java
Copyright (C) 2002 Marc Boorshtein
The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
you may not use this file except in compliance with the License. You may obtain a copy of the
License at http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
language governing rights and limitations under the License.
*/
/**
*Implements IfResults tag
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import java.util.*;
import net.sourceforge.idrs.core.report.*;
import net.sourceforge.idrs.deploy.compile.Compiler;
import net.sourceforge.idrs.deploy.compile.CompilerState;
public class IfResults extends net.sourceforge.idrs.deploy.compile.Compiler {
net.sourceforge.idrs.core.report.IfResultsChunk ifrs;
/** Creates new IfResults */
public IfResults() {
}
/**
*Retrieves the IfResults chunk
*/
public IfResultsChunk getIfResults() {
return this.ifrs;
}
/**
* allows for a compiler to use the attributes of the calling tag
*/
public void setAttributes(Attributes atts) throws Exception {
super.setAttributes(atts);
ifrs = new IfResultsChunk(atts.getValue("db"));
}
/**
* allows for the compiler to work with the current state of the page compilation
*/
public void setState(CompilerState state) throws Exception {
super.setState(state);
if (! state.isLineNull())
state.sealLine();
this.state = state;
}
/**
* allows for the execution of any wrap-up code at the hitting of the end tag
*/
public void seal() throws Exception {
state.setLine(ifrs);
state.sealLine();
ifrs.seal();
}
}
--- NEW FILE: No.java ---
/*
Head.java
Copyright (C) 2002 Marc Boorshtein
The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
you may not use this file except in compliance with the License. You may obtain a copy of the
License at http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
language governing rights and limitations under the License.
*/
/**
*Implements No tag
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import java.util.*;
import net.sourceforge.idrs.core.report.*;
import net.sourceforge.idrs.deploy.compile.Compiler;
import net.sourceforge.idrs.deploy.compile.CompilerState;
public class No extends net.sourceforge.idrs.deploy.compile.units.Yes {
/** Creates new No */
public No() {
}
}
--- NEW FILE: Yes.java ---
/*
Yes.java
Copyright (C) 2002 Marc Boorshtein
The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
you may not use this file except in compliance with the License. You may obtain a copy of the
License at http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
language governing rights and limitations under the License.
*/
/**
*Implements Yes tag
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import java.util.*;
import net.sourceforge.idrs.core.report.*;
import net.sourceforge.idrs.deploy.compile.Compiler;
import net.sourceforge.idrs.deploy.compile.CompilerState;
public class Yes extends net.sourceforge.idrs.deploy.compile.units.Body {
/** Creates new Yes */
public Yes() {
}
/**
* allows for a compiler to use the attributes of the calling tag
*/
public void setAttributes(Attributes atts) throws Exception {
this.atts=atts;
}
/**
* allows for the compiler to work with the current state of the page compilation
*/
public void setState(CompilerState state) throws Exception {
this.state=state;
state.pushLines();
}
/**
* allows for the execution of any wrap-up code at the hitting of the end tag
*/
public void seal() throws Exception {
state.sealLine();
Vector lines = state.popLines();
IfResultsChunk ifrs = ((IfResults) state.peekNode()).getIfResults();
ifrs.setLines(lines);
}
}
Index: Body.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/Body.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Body.java 27 Feb 2002 23:56:31 -0000 1.1
--- Body.java 4 Mar 2002 23:05:35 -0000 1.2
***************
*** 1,8 ****
/*
! * Body.java
! *
! * Created on February 12, 2002, 12:56 PM
*/
-
package net.sourceforge.idrs.deploy.compile.units;
--- 1,14 ----
/*
! Body.java
! Copyright (C) 2002 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
! License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
! language governing rights and limitations under the License.
*/
package net.sourceforge.idrs.deploy.compile.units;
***************
*** 17,23 ****
/**
! *
! * @author mlb
! * @version
*/
public class Body extends net.sourceforge.idrs.deploy.compile.Compiler {
--- 23,27 ----
/**
! *Implements the RML body tag
*/
public class Body extends net.sourceforge.idrs.deploy.compile.Compiler {
***************
*** 26,64 ****
public Body() {
}
!
/**
*allows for a compiler to use the attributes of the calling tag
*/
public void setAttributes(Attributes atts) throws Exception {
!
super.setAttributes(atts);
!
! state.sealLine();
if (state.getReport().getBody().isHTML()) {
Line line = state.getCurrentLine();
! line.addChunk(new net.sourceforge.idrs.core.report.TextChunk("<BODY "));
for (int i=0,m=atts.getLength();i<m;i++) {
! line.addChunk(new TextChunk(atts.getLocalName(i) + "=\"" + atts.getValue(i) + "\" "));
}
! line.addChunk(new TextChunk(">"));
state.sealLine();
}
!
!
}
!
!
!
public void useMethod(String val,Attributes atts) throws Exception {
!
String objid = atts.getValue("objid");
String varlistId = atts.getValue("varlist");
LinkedList varList = (LinkedList) ((HashMap) state.getAttribute("IDRS_VAR_LISTS")).get(varlistId);
Line curr = state.getCurrentLine();
!
curr.addChunk(new ObjectChunk(val,varList.toArray(),varlistId,objid));
!
}
!
public void field(String val,Attributes atts) throws Exception {
String format = atts.getValue("format");
--- 30,79 ----
public Body() {
}
!
! /**
! *allows for the compiler to work with the current state of the page compilation
! */
! public void setState(CompilerState state) throws Exception {
! super.setState(state);
! state.pushLines();
! }
!
/**
*allows for a compiler to use the attributes of the calling tag
*/
public void setAttributes(Attributes atts) throws Exception {
!
super.setAttributes(atts);
! String bodyTag;
!
if (state.getReport().getBody().isHTML()) {
Line line = state.getCurrentLine();
! //line.addChunk(new net.sourceforge.idrs.core.report.TextChunk("<BODY "));
! bodyTag="<BODY ";
for (int i=0,m=atts.getLength();i<m;i++) {
! bodyTag += atts.getLocalName(i) + "=\"" + atts.getValue(i) + "\" ";
}
! bodyTag += ">";
! System.out.println("Body tag : " + bodyTag);
! line.addChunk(new TextChunk(bodyTag));
state.sealLine();
}
!
!
}
!
!
!
public void useMethod(String val,Attributes atts) throws Exception {
!
String objid = atts.getValue("objid");
String varlistId = atts.getValue("varlist");
LinkedList varList = (LinkedList) ((HashMap) state.getAttribute("IDRS_VAR_LISTS")).get(varlistId);
Line curr = state.getCurrentLine();
!
curr.addChunk(new ObjectChunk(val,varList.toArray(),varlistId,objid));
!
}
!
public void field(String val,Attributes atts) throws Exception {
String format = atts.getValue("format");
***************
*** 67,88 ****
field = val.substring(val.indexOf(".")+1);
Line line = state.getCurrentLine();
line.addChunk(new net.sourceforge.idrs.core.report.FieldChunk(id,field,format,state.getCurrentRepeatLine()));
}
!
public void inputResults(String val,Attributes atts) throws Exception {
Line line = state.getCurrentLine();
line.addChunk(new net.sourceforge.idrs.core.report.InputResultsChunk(val));
}
!
public void script(String val, Attributes atts) throws Exception {
state.getCurrentLine().addChunk(new net.sourceforge.idrs.core.report.ShortScriptChunk(val));
}
!
! public void evalScript(String val,Attributes atts) throws Exception {
state.getCurrentLine().addChunk(new net.sourceforge.idrs.core.report.EvalScriptChunk(val));
}
!
public void text(String val,Attributes atts) throws Exception {
! if (val.indexOf('\n') != -1) {
StringTokenizer tok = new StringTokenizer(val,"\n",false);
Line line;
--- 82,105 ----
field = val.substring(val.indexOf(".")+1);
Line line = state.getCurrentLine();
+
line.addChunk(new net.sourceforge.idrs.core.report.FieldChunk(id,field,format,state.getCurrentRepeatLine()));
}
!
public void inputResults(String val,Attributes atts) throws Exception {
Line line = state.getCurrentLine();
line.addChunk(new net.sourceforge.idrs.core.report.InputResultsChunk(val));
}
!
public void script(String val, Attributes atts) throws Exception {
state.getCurrentLine().addChunk(new net.sourceforge.idrs.core.report.ShortScriptChunk(val));
}
!
! public void echoScript(String val,Attributes atts) throws Exception {
state.getCurrentLine().addChunk(new net.sourceforge.idrs.core.report.EvalScriptChunk(val));
}
!
public void text(String val,Attributes atts) throws Exception {
! System.out.println("val = \"" + val + "\"");
! /*if (val.indexOf('\n') != -1) {
StringTokenizer tok = new StringTokenizer(val,"\n",false);
Line line;
***************
*** 95,99 ****
else {
state.getCurrentLine().addChunk(new TextChunk(val));
! }
}
--- 112,117 ----
else {
state.getCurrentLine().addChunk(new TextChunk(val));
! }*/
! state.getCurrentLine().addChunk(new TextChunk(val));
}
***************
*** 102,107 ****
*/
public void seal() throws Exception {
!
}
!
}
--- 120,136 ----
*/
public void seal() throws Exception {
! if (state.getCurrentLine() != null)
! state.sealLine();
! if (state.getReport().getBody().isHTML()) {
! Line line = state.getCurrentLine();
! line.addChunk(new TextChunk("</BODY>"));
! state.sealLine();
! }
!
! Vector lines = state.popLines();
! System.out.println("body lines : " + lines.size());
! state.getReport().getBody().setLines(lines);
! state.getReport().getBody().seal();
}
!
}
Index: Constructor.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/Constructor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Constructor.java 27 Feb 2002 23:56:31 -0000 1.1
--- Constructor.java 4 Mar 2002 23:05:35 -0000 1.2
***************
*** 1,8 ****
/*
! * Constructor.java
! *
! * Created on February 6, 2002, 3:26 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
--- 1,18 ----
/*
! Constructor.java
! Copyright (C) 2002 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
! License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
! language governing rights and limitations under the License.
*/
+ /**
+ *Compiles the constructor tag
+ */
package net.sourceforge.idrs.deploy.compile.units;
Index: Db.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/Db.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Db.java 27 Feb 2002 23:56:31 -0000 1.1
--- Db.java 4 Mar 2002 23:05:35 -0000 1.2
***************
*** 1,8 ****
/*
! * Db.java
! *
! * Created on February 6, 2002, 3:50 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
--- 1,18 ----
/*
! Db.java
! Copyright (C) 2002 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
! License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
! language governing rights and limitations under the License.
*/
+ /**
+ *Handles the db RML tag
+ */
package net.sourceforge.idrs.deploy.compile.units;
***************
*** 34,38 ****
*/
public void seal() throws Exception {
! db.seal();
this.state.getReport().getHead().addDB(db);
}
--- 44,48 ----
*/
public void seal() throws Exception {
! //db.seal();
this.state.getReport().getHead().addDB(db);
}
***************
*** 43,46 ****
--- 53,58 ----
public void setAttributes(Attributes atts) throws Exception {
super.setAttributes(atts);
+
+
id = atts.getValue("id");
db = new DB(id);
***************
*** 49,53 ****
public void dbName(String val, Attributes atts) throws Exception {
! db.setDBName(val);
}
--- 61,65 ----
public void dbName(String val, Attributes atts) throws Exception {
! db.setDBName(val,false);
}
Index: Head.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/Head.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Head.java 27 Feb 2002 23:56:31 -0000 1.1
--- Head.java 4 Mar 2002 23:05:35 -0000 1.2
***************
*** 1,6 ****
/*
! * Head.java
! *
! * Created on February 4, 2002, 9:05 AM
*/
--- 1,16 ----
/*
! Head.java
! Copyright (C) 2002 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
! License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
! language governing rights and limitations under the License.
! */
! /**
! *Implements Head tag
*/
***************
*** 29,36 ****
this.state.getReport().getHead().addText("</HEAD>");
}
!
this.state.getReport().getHead().seal();
}
/**
* allows for a compiler to use the attributes of the calling tag
--- 39,50 ----
this.state.getReport().getHead().addText("</HEAD>");
}
!
this.state.getReport().getHead().seal();
}
+
+
+
+
/**
* allows for a compiler to use the attributes of the calling tag
***************
*** 39,43 ****
String tag;
int i;
! if (this.state.getReport().getBody().isHTML()) {
tag = "<HEAD ";
for (i=0; i < atts.getLength(); i++) {
--- 53,66 ----
String tag;
int i;
!
! if (this.state==null) System.out.println("state null");
! IDRSRep rep = this.state.getReport();
! if (rep == null) System.out.println("Rep Null");
! IDRSBody body = rep.getBody();
! if (body == null) System.out.println("Body Null");
!
! boolean ishtml = body.isHTML();
!
! if (ishtml) {
tag = "<HEAD ";
for (i=0; i < atts.getLength(); i++) {
***************
*** 48,55 ****
}
}
!
public void text(java.lang.String val, Attributes atts) throws Exception {
this.state.getReport().getHead().addText(val);
}
!
}
--- 71,78 ----
}
}
!
public void text(java.lang.String val, Attributes atts) throws Exception {
this.state.getReport().getHead().addText(val);
}
!
}
Index: Method.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/Method.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Method.java 27 Feb 2002 23:56:31 -0000 1.1
--- Method.java 4 Mar 2002 23:05:35 -0000 1.2
***************
*** 1,8 ****
/*
! * Method.java
! *
! * Created on February 6, 2002, 3:41 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
--- 1,19 ----
/*
! Method.java
! Copyright (C) 2002 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
! License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
! language governing rights and limitations under the License.
! */
! /**
! *Implements Method tag
*/
+
package net.sourceforge.idrs.deploy.compile.units;
***************
*** 16,23 ****
import net.sourceforge.idrs.utils.ObjectStore;
- /**
- * Encapsulates the method tag
- * @author Marc Boorshtein
- */
public class Method extends net.sourceforge.idrs.deploy.compile.units.Constructor {
String name;
--- 27,30 ----
***************
*** 52,56 ****
*/
public void name(String val, Attributes atts) {
! this.name=name;
}
--- 59,63 ----
*/
public void name(String val, Attributes atts) {
! this.name=val;
}
Index: Object.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/Object.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Object.java 27 Feb 2002 23:56:31 -0000 1.1
--- Object.java 4 Mar 2002 23:05:35 -0000 1.2
***************
*** 1,8 ****
/*
! * Object.java
! *
! * Created on February 6, 2002, 2:59 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
--- 1,19 ----
/*
! Object.java
! Copyright (C) 2002 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
! License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
! language governing rights and limitations under the License.
! */
! /**
! *Implements object tag
*/
+
package net.sourceforge.idrs.deploy.compile.units;
***************
*** 16,23 ****
import net.sourceforge.idrs.utils.ObjectStore;
! /**
! * Encapsulates the object tag
! * @author Marc Boorshtein
! */
public class Object extends net.sourceforge.idrs.deploy.compile.Compiler {
--- 27,31 ----
import net.sourceforge.idrs.utils.ObjectStore;
!
public class Object extends net.sourceforge.idrs.deploy.compile.Compiler {
Index: Repeat.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/Repeat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Repeat.java 27 Feb 2002 23:56:31 -0000 1.1
--- Repeat.java 4 Mar 2002 23:05:35 -0000 1.2
***************
*** 1,8 ****
/*
! * Repeat.java
! *
! * Created on February 19, 2002, 1:28 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
--- 1,19 ----
/*
! Repeat.java
! Copyright (C) 2002 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
! License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
! language governing rights and limitations under the License.
! */
! /**
! *Implements repeat tag
*/
+
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
***************
*** 15,25 ****
import net.sourceforge.idrs.utils.ObjectStore;
! /**
! *
! * @author mlb
! * @version
! */
public class Repeat extends net.sourceforge.idrs.deploy.compile.units.Body {
String id, color1, color2;
/** Creates new Repeat */
--- 26,33 ----
import net.sourceforge.idrs.utils.ObjectStore;
!
public class Repeat extends net.sourceforge.idrs.deploy.compile.units.Body {
String id, color1, color2;
+ RepeatLine repLine;
/** Creates new Repeat */
***************
*** 32,48 ****
*/
public void setAttributes(Attributes atts) throws Exception {
- super.setAttributes(atts);
this.atts = atts;
id = atts.getValue("id");
color1 = atts.getValue("color1");
color2 = atts.getValue("color2");
}
/**
*allows for the compiler to work with the current state of the page compilation
*/
public void setState(CompilerState state) throws Exception {
! super.setState(state);
! state.addRepeatLine(id,color1,color2);
}
--- 40,66 ----
*/
public void setAttributes(Attributes atts) throws Exception {
this.atts = atts;
id = atts.getValue("id");
color1 = atts.getValue("color1");
color2 = atts.getValue("color2");
+ repLine = new RepeatLine(id,color1,color2);
}
+
/**
*allows for the compiler to work with the current state of the page compilation
*/
public void setState(CompilerState state) throws Exception {
! this.state = state;
! state.sealLine();
! state.pushLines();
! //state.addRepeatLine(id,color1,color2);
! }
!
! /**
! *Retrieves the current repeat line
! */
! public RepeatLine getRepeatLine() {
! return this.repLine;
}
***************
*** 51,55 ****
*/
public void seal() throws Exception {
! state.setRepeatLine();
}
--- 69,80 ----
*/
public void seal() throws Exception {
! //if (state.getCurrentLine() != null)
! state.sealLine();
! Vector lines = state.popLines();
! System.out.println("num lines repeat : " + lines.size());
! repLine.setLines(lines);
!
! state.setLine(repLine);
! state.sealLine();
}
Index: Rml.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/Rml.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Rml.java 27 Feb 2002 23:56:31 -0000 1.1
--- Rml.java 4 Mar 2002 23:05:35 -0000 1.2
***************
*** 1,6 ****
/*
! * Rml.java
! *
! * Created on February 2, 2002, 8:57 PM
*/
--- 1,16 ----
/*
! Rml.java
! Copyright (C) 2002 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
! License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
! language governing rights and limitations under the License.
! */
! /**
! *Implements Rml tag
*/
***************
*** 15,23 ****
import net.sourceforge.idrs.deploy.compile.CompilerState;
! /**
! *
! * @author mlb
! * @version
! */
public class Rml extends net.sourceforge.idrs.deploy.compile.Compiler {
--- 25,29 ----
import net.sourceforge.idrs.deploy.compile.CompilerState;
!
public class Rml extends net.sourceforge.idrs.deploy.compile.Compiler {
***************
*** 39,42 ****
--- 45,49 ----
public void isHtml(String val, Attributes atts) throws Exception {
this.state.getReport().getBody().isHTML(Boolean.valueOf(val).booleanValue());
+ System.out.println("Set HTML");
}
Index: SQL.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/SQL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SQL.java 27 Feb 2002 23:56:31 -0000 1.1
--- SQL.java 4 Mar 2002 23:05:35 -0000 1.2
***************
*** 1,7 ****
/*
! * SQL.java
! *
! * Created on February 6, 2002, 4:01 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
--- 1,18 ----
/*
! SQL.java
! Copyright (C) 2002 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
! License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
! language governing rights and limitations under the License.
*/
+ /**
+ *Implements SQL tag
+ */
+
package net.sourceforge.idrs.deploy.compile.units;
***************
*** 16,24 ****
import net.sourceforge.idrs.utils.*;
! /**
! *
! * @author mlb
! * @version
! */
public class SQL extends net.sourceforge.idrs.deploy.compile.Compiler {
protected DB db;
--- 27,31 ----
import net.sourceforge.idrs.utils.*;
!
public class SQL extends net.sourceforge.idrs.deploy.compile.Compiler {
protected DB db;
***************
*** 48,56 ****
}
! void varType(String val, Attributes att) throws Exception {
db.addVarType(val);
}
!
! void src(String val, Attributes atts) {
db.setSQL(val);
}
--- 55,63 ----
}
! public void varType(String val, Attributes att) throws Exception {
db.addVarType(val);
}
!
! public void src(String val, Attributes atts) throws Exception {
db.setSQL(val);
}
Index: StoredProc.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/StoredProc.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StoredProc.java 27 Feb 2002 23:56:31 -0000 1.1
--- StoredProc.java 4 Mar 2002 23:05:35 -0000 1.2
***************
*** 1,8 ****
/*
! * StoredProc.java
! *
! * Created on February 6, 2002, 4:05 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
--- 1,19 ----
/*
! StoredProc.java
! Copyright (C) 2002 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
! License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
! language governing rights and limitations under the License.
! */
! /**
! *Implements StoredProc tag
*/
+
package net.sourceforge.idrs.deploy.compile.units;
***************
*** 16,24 ****
import net.sourceforge.idrs.utils.*;
! /**
! *
! * @author mlb
! * @version
! */
public class StoredProc extends net.sourceforge.idrs.deploy.compile.units.SQL {
--- 27,31 ----
import net.sourceforge.idrs.utils.*;
!
public class StoredProc extends net.sourceforge.idrs.deploy.compile.units.SQL {
Index: VarList.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units/VarList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VarList.java 27 Feb 2002 23:56:31 -0000 1.1
--- VarList.java 4 Mar 2002 23:05:35 -0000 1.2
***************
*** 1,8 ****
/*
! * VarList.java
! *
! * Created on February 6, 2002, 2:43 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
--- 1,19 ----
/*
! VarList.java
! Copyright (C) 2002 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
! License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
! language governing rights and limitations under the License.
! */
! /**
! *Implements VarList tag
*/
+
package net.sourceforge.idrs.deploy.compile.units;
***************
*** 15,23 ****
import net.sourceforge.idrs.deploy.compile.CompilerState;
- /**
- *
- * @author mlb
- * @version
- */
public class VarList extends net.sourceforge.idrs.deploy.compile.Compiler {
LinkedList list;
--- 26,29 ----
|
|
From: Marc B. <big...@us...> - 2002-03-04 23:05:38
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/embedable In directory usw-pr-cvs1:/tmp/cvs-serv28790/src/net/sourceforge/idrs/script/embedable Modified Files: IDRSShell.class Log Message: Completed initial xml compilation system Index: IDRSShell.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/embedable/IDRSShell.class,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsBFuGI0 and /tmp/cvsy7sEiR differ |
|
From: Marc B. <big...@us...> - 2002-03-04 23:05:38
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script In directory usw-pr-cvs1:/tmp/cvs-serv28790/src/net/sourceforge/idrs/script Modified Files: IDRSScript.class Log Message: Completed initial xml compilation system Index: IDRSScript.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/IDRSScript.class,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsWxJo0P and /tmp/cvskxieSv differ |
|
From: Marc B. <big...@us...> - 2002-03-04 23:05:38
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils
In directory usw-pr-cvs1:/tmp/cvs-serv28790/src/net/sourceforge/idrs/utils
Modified Files:
ObjectStore.java
Log Message:
Completed initial xml compilation system
Index: ObjectStore.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/ObjectStore.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ObjectStore.java 6 Nov 2001 23:03:14 -0000 1.4
--- ObjectStore.java 4 Mar 2002 23:05:35 -0000 1.5
***************
*** 11,68 ****
*/
public final class ObjectStore implements Serializable {
! protected transient HashMap methods;
! protected Object obj;
! protected String className;
! protected Class cls;
! protected String id;
!
! protected transient Vector bmethodNames;
! protected transient Vector bmethodClasses;
!
! protected String[] methodNames;
! protected Class[][] methodClasses;
! protected Class[] varTypes;
! protected transient boolean addToMethVec = false;
! static final long serialVersionUID = 3570053539799841110L;
! /**
! * Creates an ObjectStore based on an Id and a classname
! */
! public ObjectStore(String id, String className) {
! methods=new HashMap();
! this.id = id;
! this.className = className;
! try {
! cls = Class.forName(className);
! }
! catch (Exception e) {
! e.printStackTrace();
! }
! addToMethVec = false;
! }
!
! /**
! * Creates a ObjectStore based on an ID
! */
! public ObjectStore(String id) {
! this.id = id;
! addToMethVec = false;
! }
!
! /**
! * Loads given class
! */
! public void setClassName(String clsName) throws Exception {
! this.className = clsName;
! try {
! cls = Class.forName(className);
}
! catch (Exception e) {
! throw new Exception("Class : " + clsName + " is not a vaild class");
}
/*
Method[] meths = cls.getMethods();
!
int i;
Method meth;
--- 11,69 ----
*/
public final class ObjectStore implements Serializable {
! protected transient HashMap methods;
! protected Object obj;
! protected String className;
! protected Class cls;
! protected String id;
! protected transient Vector bmethodNames;
! protected transient Vector bmethodClasses;
! protected String[] methodNames;
! protected Class[][] methodClasses;
! protected Class[] varTypes;
! protected transient boolean addToMethVec = false;
! transient boolean sealed;
! static final long serialVersionUID = 3570053539799841110L;
! /**
! * Creates an ObjectStore based on an Id and a classname
! */
! public ObjectStore(String id, String className) {
! methods=new HashMap();
! this.id = id;
! this.className = className;
! try {
! cls = Class.forName(className);
! }
! catch (Exception e) {
! e.printStackTrace();
! }
! sealed = false;
! addToMethVec = false;
}
!
! /**
! * Creates a ObjectStore based on an ID
! */
! public ObjectStore(String id) {
! this.id = id;
! addToMethVec = false;
! sealed=false;
}
+
+ /**
+ * Loads given class
+ */
+ public void setClassName(String clsName) throws Exception {
+ this.className = clsName;
+ try {
+ cls = Class.forName(className);
+ }
+ catch (Exception e) {
+ throw new Exception("Class : " + clsName + " is not a vaild class");
+ }
/*
Method[] meths = cls.getMethods();
!
int i;
Method meth;
***************
*** 70,263 ****
meth = meths[i];
}
! */
! }
!
! /**
! * Loads given method for use
! */
! public void addMethod(String methodName, Class[] argsT) throws Exception {
! //Method[] meths = cls.getMethods();
! int i;
! Method meth;
! meth = cls.getMethod(methodName,argsT);
! //Class[] clss = meth.getParameterTypes();
! //clss = argTypes;
!
!
! methods.put(methodName,meth);
! if (addToMethVec) {
! bmethodNames.addElement(methodName);
! bmethodClasses.addElement(argsT);
! }
! }
!
! /**
! * Returns the class' of a given methods arguments
! */
! public Class[] getMethodTypes(String method) {
!
! Method meth = (Method) this.methods.get(method);
! Class[] clss = meth.getParameterTypes();
! return clss;
! }
!
! /**
! * Executes a given method with given arguments
! */
! public Object execMethod(String methodName, Object[] vals) throws Exception {
! Object retVal;
!
!
! retVal = ((Method) methods.get(methodName)).invoke(obj,vals);
! return retVal;
!
! }
!
! /**
! * Calls the constructor matching the artypes
! */
! public void initiate(Class[] argTypes, Object[] args) throws Exception {
!
! try {
!
! Constructor con = this.cls.getConstructor(argTypes);
! obj = con.newInstance(args);
!
!
}
! catch (Exception e) {
! throw new Exception("No Matching Constructor");
}
! }
!
! /**
! * Used to return a valid class for the ObjectStore
! */
! public static Object getValue(Class cls, String val,Connection con,IDRSScript idrs) throws Exception {
! val = val.trim();
! if (cls == String.class) {
! return val;
}
! else if (cls == Integer.class) {
! return new Integer(val);
}
! else if (cls == Float.class) {
! return new Float(val);
}
! else if (cls == java.sql.Date.class) {
! return new java.sql.Date(java.sql.Date.parse(val));
}
! else if (cls == java.sql.Time.class) {
! return new java.sql.Time(java.sql.Time.parse(val));
}
! else if (cls == java.sql.Connection.class) {
! return con;
}
! else if (cls == IDRSScript.class) {
! return idrs;
}
- else
- throw new Exception(cls.toString() + " not a valid class for the ObjectStore");
-
- }
-
- public Object getRef() throws Exception {
- return obj;
- }
-
- //used for new IDRS
- /**
- Used for rebuilding and object after serialization when a report is called
- */
- public void rebuild(Object[] vals) throws Exception {
-
- this.methods=new HashMap();
-
- Method init = cls.getMethod("reInit",this.varTypes);
- if (init == null) {
- throw new Exception("No init method");
- }
-
- try {
- init.invoke(obj,vals);
-
- int i;
-
- addToMethVec = false;
- for (i=0;i<methodNames.length;i++) {
- addMethod((String) methodNames[i],methodClasses[i]);
- }
- }
- catch (Exception e) {
- throw new Exception("No init method");
- }
- }
-
- /**
- Used for first initialization of object for empty constructor
- */
- public void firstInitiate(Class[] argTypes) throws Exception {
- try {
- obj = cls.newInstance();
- }
- catch (Exception noCon) {
- throw new Exception("No default constructor");
- }
-
-
-
- this.varTypes = argTypes;
- //System.out.println("Argtypes Size: " + this.varTypes.length);
! bmethodNames = new Vector();
! bmethodClasses = new Vector();
! addToMethVec = true;
! methods = new HashMap();
! }
!
! public Class[] getTypes() {
! return this.varTypes;
! }
!
!
!
! public String getID() {
! return id;
! }
!
! public void close() throws Exception {
! //methods.clear();
! if (obj instanceof net.sourceforge.idrs.utils.CleanUp)
! ((CleanUp) obj).cleanUp();
! }
!
! /**
"Seals" the ObjectStore moving all vector data into arrays
! */
! public int seal() {
! methodNames = new String[bmethodNames.size()];
! methodClasses = new Class[bmethodClasses.size()][];
! int i;
!
! for (i = 0;i<methodNames.length;i++) {
! methodNames[i] = (String) bmethodNames.elementAt(i);
! methodClasses[i] = (Class[]) bmethodClasses.elementAt(i);
! }
!
! bmethodNames.removeAllElements();
! bmethodClasses.removeAllElements();
!
! if (this.varTypes.length > 0) {
! return methodNames.length + 1;
! }
! else {
! return methodNames.length;
! }
!
! }
!
}
--- 71,279 ----
meth = meths[i];
}
! */
! }
! /**
! * Loads given method for use
! */
! public void addMethod(String methodName, Class[] argsT) throws Exception {
! //Method[] meths = cls.getMethods();
! int i;
! Method meth;
!
!
!
!
! meth = cls.getMethod(methodName,argsT);
! //Class[] clss = meth.getParameterTypes();
! //clss = argTypes;
!
!
! methods.put(methodName,meth);
! if (addToMethVec) {
! bmethodNames.addElement(methodName);
! bmethodClasses.addElement(argsT);
! }
! }
! /**
! * Returns the class' of a given methods arguments
! */
! public Class[] getMethodTypes(String method) {
!
!
! Method meth = (Method) this.methods.get(method);
+
+ Class[] clss = meth.getParameterTypes();
+
+ return clss;
+ }
! /**
! * Executes a given method with given arguments
! */
! public Object execMethod(String methodName, Object[] vals) throws Exception {
! Object retVal;
!
!
! retVal = ((Method) methods.get(methodName)).invoke(obj,vals);
!
!
! return retVal;
!
}
!
! /**
! * Calls the constructor matching the artypes
! */
! public void initiate(Class[] argTypes, Object[] args) throws Exception {
!
! try {
!
! Constructor con = this.cls.getConstructor(argTypes);
! obj = con.newInstance(args);
!
!
! }
! catch (Exception e) {
! throw new Exception("No Matching Constructor");
! }
}
!
! /**
! * Used to return a valid class for the ObjectStore
! */
! public static Object getValue(Class cls, String val,Connection con,IDRSScript idrs) throws Exception {
! val = val.trim();
! if (cls == String.class) {
! return val;
! }
! else if (cls == Integer.class) {
! return new Integer(val);
! }
! else if (cls == Float.class) {
! return new Float(val);
! }
! else if (cls == java.sql.Date.class) {
! return new java.sql.Date(java.sql.Date.parse(val));
! }
! else if (cls == java.sql.Time.class) {
! return new java.sql.Time(java.sql.Time.parse(val));
! }
! else if (cls == java.sql.Connection.class) {
! return con;
! }
! else if (cls == IDRSScript.class) {
! return idrs;
! }
! else
! throw new Exception(cls.toString() + " not a valid class for the ObjectStore");
!
}
!
! public Object getRef() throws Exception {
! return obj;
}
!
! //used for new IDRS
! /**
! Used for rebuilding and object after serialization when a report is called
! */
! public void rebuild(Object[] vals) throws Exception {
!
! this.methods=new HashMap();
!
! Method init = cls.getMethod("reInit",this.varTypes);
! if (init == null) {
! throw new Exception("No init method");
! }
!
! try {
! init.invoke(obj,vals);
!
! int i;
!
! addToMethVec = false;
!
! for (i=0;i<methodNames.length;i++) {
!
!
! addMethod((String) methodNames[i],methodClasses[i]);
! }
! }
! catch (Exception e) {
! throw new Exception("No init method");
! }
}
!
! /**
! Used for first initialization of object for empty constructor
! */
! public void firstInitiate(Class[] argTypes) throws Exception {
! try {
! obj = cls.newInstance();
! }
! catch (Exception noCon) {
! throw new Exception("No default constructor");
! }
!
!
!
! this.varTypes = argTypes;
! //System.out.println("Argtypes Size: " + this.varTypes.length);
!
! bmethodNames = new Vector();
! bmethodClasses = new Vector();
! addToMethVec = true;
! methods = new HashMap();
}
!
! public Class[] getTypes() {
! return this.varTypes;
}
!
!
!
! public String getID() {
! return id;
}
!
! public void close() throws Exception {
! //methods.clear();
! if (obj instanceof net.sourceforge.idrs.utils.CleanUp)
! ((CleanUp) obj).cleanUp();
}
! /**
"Seals" the ObjectStore moving all vector data into arrays
! */
! public int seal() {
! if (! sealed) {
!
! methodNames = new String[bmethodNames.size()];
! methodClasses = new Class[bmethodClasses.size()][];
! int i;
!
!
!
! for (i = 0;i<methodNames.length;i++) {
! methodNames[i] = (String) bmethodNames.elementAt(i);
! methodClasses[i] = (Class[]) bmethodClasses.elementAt(i);
! }
!
! bmethodNames.removeAllElements();
! bmethodClasses.removeAllElements();
! sealed = true;
! }
!
! if (this.varTypes.length > 0) {
! return methodNames.length + 1;
! }
! else {
! return methodNames.length;
! }
!
! }
!
}
|
|
From: Marc B. <big...@us...> - 2002-03-04 23:05:38
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile
In directory usw-pr-cvs1:/tmp/cvs-serv28790/src/net/sourceforge/idrs/deploy/compile
Modified Files:
Compiler.java CompilerState.java RMLHandler.java
Added Files:
RmlCompiler.java
Log Message:
Completed initial xml compilation system
--- NEW FILE: RmlCompiler.java ---
/*
RmlCompiler.java
Copyright (C) 2002 Marc Boorshtein
The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
you may not use this file except in compliance with the License. You may obtain a copy of the
License at http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
language governing rights and limitations under the License.
*/
/**
*This class is used to transform and compile an rml page
*/
package net.sourceforge.idrs.deploy.compile;
import net.sourceforge.idrs.core.report.*;
import java.util.*;
import java.io.*;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import net.sourceforge.idrs.deploy.macro.*;
import net.sourceforge.idrs.deploy.compile.*;
/**
*
* @author mlb
* @version
*/
public class RmlCompiler {
IDRSRep rep;
/** Creates new RmlCompiler */
public RmlCompiler(PrintWriter log, String rml, String xmlParser,String schemaSrc, boolean isFile, String rmlNS) throws Exception {
boolean fail;
StringWriter transformOut = new StringWriter();
InputSource in;
CompilerState comp = new CompilerState();
MacroToXML trans = new MacroToXML(xmlParser,schemaSrc,isFile,rmlNS);
log.println("Transformation : ");
try {
trans.setRML(rml);
trans.setWriter(transformOut);
trans.transformToXML();
System.out.println("Transformation Complete!");
fail = false;
}
catch (Exception e) {
fail = true;
e.printStackTrace(log);
}
log.println(transformOut.getBuffer());
log.flush();
if (fail) {
log.println("Translation Failed");
log.flush();
return;
}
try {
StringReader xmlIn = new StringReader(transformOut.getBuffer().toString());
in = new InputSource(xmlIn);
XMLReader parser = XMLReaderFactory.createXMLReader(xmlParser);
parser.setContentHandler(new RMLHandler(comp));
parser.parse(in);
}
catch (Exception ee) {
ee.printStackTrace(log);
}
if (fail) {
log.println("Compilation Failed");
return;
}
log.flush();
rep = comp.getReport();
}
public IDRSRep getReport() {
return rep;
}
}
Index: Compiler.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/Compiler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Compiler.java 27 Feb 2002 23:56:31 -0000 1.3
--- Compiler.java 4 Mar 2002 23:05:34 -0000 1.4
***************
*** 41,44 ****
--- 41,45 ----
public void setState(CompilerState state) throws Exception {
this.state = state;
+
}
Index: CompilerState.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/CompilerState.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompilerState.java 27 Feb 2002 23:56:31 -0000 1.2
--- CompilerState.java 4 Mar 2002 23:05:34 -0000 1.3
***************
*** 12,15 ****
--- 12,16 ----
import net.sourceforge.idrs.script.*;
import net.sourceforge.idrs.script.embedable.*;
+ import net.sourceforge.idrs.deploy.compile.units.Repeat;
/**
***************
*** 25,29 ****
IDRSRep rep;
HashMap comp_atts;
!
/** Creates new CompilerState */
public CompilerState() {
--- 26,31 ----
IDRSRep rep;
HashMap comp_atts;
! Stack lines;
!
/** Creates new CompilerState */
public CompilerState() {
***************
*** 31,38 ****
nodes = new Stack();
comp_atts = new HashMap();
!
}
/**
*Pushes a new <code>Compiler</code> instance onto the stack
*@param node New <code>Compiler</code> instace
--- 33,69 ----
nodes = new Stack();
comp_atts = new HashMap();
! lines = new Stack();
!
! }
!
! /**
! Pushes a new set of lines onto the stack
! */
! public void pushLines() throws Exception {
! lines.push(new Vector());
! System.out.println("Stack size : " + lines.size());
! }
!
! /**
! *Pops the lines off the stack
! */
! public Vector popLines() {
! Vector vec = (Vector) lines.pop();
! Enumeration e = vec.elements();
! while (e.hasMoreElements()) {
! System.out.println(e.nextElement());
! }
! System.out.println("Stack size : " + lines.size());
! return vec;
}
/**
+ *Peeks at the top of the lines stack
+ */
+ public Vector peekLines() {
+ return (Vector) lines.peek();
+ }
+
+ /**
*Pushes a new <code>Compiler</code> instance onto the stack
*@param node New <code>Compiler</code> instace
***************
*** 41,45 ****
nodes.push(node);
}
!
/**
*Pops current <code>Compiler</code> instance from the stack
--- 72,76 ----
nodes.push(node);
}
!
/**
*Pops current <code>Compiler</code> instance from the stack
***************
*** 48,52 ****
return (Compiler) nodes.pop();
}
!
/**
*Peeks at current <code>Compiler</code> instance from the stack
--- 79,83 ----
return (Compiler) nodes.pop();
}
!
/**
*Peeks at current <code>Compiler</code> instance from the stack
***************
*** 55,59 ****
return (Compiler) nodes.peek();
}
!
/**
*Retrieves the <code>Line</code> currently being worked on
--- 86,90 ----
return (Compiler) nodes.peek();
}
!
/**
*Retrieves the <code>Line</code> currently being worked on
***************
*** 61,74 ****
public Line getCurrentLine() {
if (currentLine == null) {
! this.currentLine = new Line();
}
return this.currentLine;
}
!
/**
*Retrieves the <code>RepeatLine</code> currently being worked on
*/
public RepeatLine getCurrentRepeatLine() {
! return this.currRepLine;
}
--- 92,111 ----
public Line getCurrentLine() {
if (currentLine == null) {
! this.currentLine = new Line();
}
return this.currentLine;
}
!
/**
*Retrieves the <code>RepeatLine</code> currently being worked on
*/
public RepeatLine getCurrentRepeatLine() {
! Repeat rep = (Repeat) this.getFirstInstace(Repeat.class) ;
! if (rep != null) {
! return rep.getRepeatLine();
! }
! else {
! return null;
! }
}
***************
*** 129,156 ****
public void sealLine() {
!
this.currentLine.seal();
!
! if (this.currRepLine != null) {
! this.currRepLine.addLine(this.currentLine);
! }
! else {
! this.rep.getBody().addLine(this.currentLine);
! }
this.currentLine = null;
}
!
public void addRepeatLine(String id, String color1, String color2) throws Exception {
this.currentLine = new RepeatLine(id,color1,color2);
}
!
public void setRepeatLine() {
this.currRepLine.seal();
this.rep.getBody().addLine(this.currRepLine);
this.currRepLine = null;
! }
!
!
/**
*This allows for the setting of the current line
--- 166,189 ----
public void sealLine() {
!
this.currentLine.seal();
! ((Vector) lines.peek()).add(currentLine);
this.currentLine = null;
}
!
! /*
public void addRepeatLine(String id, String color1, String color2) throws Exception {
this.currentLine = new RepeatLine(id,color1,color2);
}
!
public void setRepeatLine() {
+
this.currRepLine.seal();
this.rep.getBody().addLine(this.currRepLine);
this.currRepLine = null;
! }*/
!
!
/**
*This allows for the setting of the current line
***************
*** 160,162 ****
--- 193,215 ----
}
+ /**
+ *Retrieves the first instance of a given class
+ */
+
+ private Object getFirstInstace(Class c) {
+ Object[] objs = nodes.toArray();
+
+ for (int i=0;i<objs.length;i++) {
+ if (c.equals(objs[i].getClass()) ) {
+ return objs[i];
+ }
+ }
+
+ return null;
+ }
+
+ public boolean isLineNull() {
+ return this.currentLine == null;
+ }
+
}
Index: RMLHandler.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/RMLHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RMLHandler.java 30 Jan 2002 01:43:13 -0000 1.1
--- RMLHandler.java 4 Mar 2002 23:05:35 -0000 1.2
***************
*** 37,45 ****
/** Creates new RMLHandler */
! public RMLHandler() {
classes = new HashMap();
methods = new HashMap();
!
! state = new CompilerState();
isMethodState = new Stack();
}
--- 37,44 ----
/** Creates new RMLHandler */
! public RMLHandler(CompilerState state) {
classes = new HashMap();
methods = new HashMap();
! this.state = state;
isMethodState = new Stack();
}
***************
*** 54,65 ****
*/
public void startElement(String namespaceURI, String localName, String rawName, Attributes atts) throws SAXException {
currBuff = new StringBuffer();
Class compileClass;
Compiler compiler;
!
! String className = RMLHandler.BASE_PACKAGE + getClassName(localName);
!
compileClass = (Class) classes.get(className);
!
if (compileClass == null) {
try {
--- 53,75 ----
*/
public void startElement(String namespaceURI, String localName, String rawName, Attributes atts) throws SAXException {
+ try {
+ System.out.println("Start Element");
+ System.out.println(localName);
+ System.out.println(rawName);
+ }
+ catch (Exception e){}
+
currBuff = new StringBuffer();
Class compileClass;
Compiler compiler;
!
! String className = getClassName(localName);
!
! try {
! System.out.println("Class Name : " + className);
! }catch (Exception e1){}
!
compileClass = (Class) classes.get(className);
!
if (compileClass == null) {
try {
***************
*** 72,95 ****
this.atts = atts;
}
!
if (compileClass != null) {
try {
compiler = (Compiler) compileClass.newInstance();
! state.pushNode(compiler);
! compiler.setAttributes(atts);
compiler.setState(state);
}
catch (Exception e) {
e.printStackTrace(System.out);
}
!
!
}
!
this.isMethodState.push(new Boolean(isMethod));
}
!
}
!
/**
*Executed at the end of a tag, performs the following tasks:<br>
--- 82,112 ----
this.atts = atts;
}
!
if (compileClass != null) {
try {
compiler = (Compiler) compileClass.newInstance();
!
compiler.setState(state);
+ compiler.setAttributes(atts);
+ state.pushNode(compiler);
+ System.out.println("Push Class : " + compiler.getClass());
+
}
catch (Exception e) {
e.printStackTrace(System.out);
}
!
!
}
!
this.isMethodState.push(new Boolean(isMethod));
+ try {
+ System.out.println("Push " + isMethod);
+ }
+ catch (Exception ee){}
}
!
}
!
/**
*Executed at the end of a tag, performs the following tasks:<br>
***************
*** 100,146 ****
*/
public void endElement(String namespaceURI, String localName, String rawName) throws SAXException {
String methodName = getMethodName(localName);
Compiler curr;
!
Class[] paramTypes = {String.class, Attributes.class};
Object[] params = {currBuff.toString(),this.atts};
Method meth;
!
this.isMethod = ((Boolean) this.isMethodState.pop()).booleanValue();
!
if (this.isMethod) {
curr = state.peekNode();
! meth = (Method) this.methods.get(methodName);
!
! if (meth == null) {
try {
meth = curr.getClass().getMethod(methodName,paramTypes);
}
catch (Exception e1) {
! e1.printStackTrace(System.out);
}
!
this.methods.put(methodName,meth);
! }
!
try {
meth.invoke(curr,params);
}
catch (Exception e2) {
! e2.printStackTrace(System.out);
}
}
else {
curr = state.popNode();
! curr.seal();
}
}
!
public void characters(char[] ch, int start, int end) {
for (int i=start;i<start + end;i++) {
! currBuff.append(ch[i]);
}
}
!
/**
*Retrieves the compiled report
--- 117,184 ----
*/
public void endElement(String namespaceURI, String localName, String rawName) throws SAXException {
+ try {
+ System.out.println("End Element");
+ System.out.println(localName);
+ System.out.println(rawName);
+ }
+ catch (Exception e){}
+
String methodName = getMethodName(localName);
Compiler curr;
!
Class[] paramTypes = {String.class, Attributes.class};
Object[] params = {currBuff.toString(),this.atts};
Method meth;
!
this.isMethod = ((Boolean) this.isMethodState.pop()).booleanValue();
! System.out.println("Pop " + this.isMethod);
!
if (this.isMethod) {
curr = state.peekNode();
! System.out.println("Current Class : " + curr.getClass());
! //meth = (Method) this.methods.get(methodName);
!
! //if (meth == null) {
try {
meth = curr.getClass().getMethod(methodName,paramTypes);
}
catch (Exception e1) {
! throw new SAXException(e1);
}
!
this.methods.put(methodName,meth);
! //}
!
try {
+ System.out.println("Curr :" + curr + "!");
+ System.out.println("Params :" + params[0] + "-" + params[1]);
+ System.out.println("Method : " + meth.getName());
+
meth.invoke(curr,params);
}
catch (Exception e2) {
! //e2.printStackTrace(System.out);
! throw new SAXException(e2);
}
}
else {
curr = state.popNode();
! System.out.println("Pop Class : " + curr.getClass());
! try {
! curr.seal();
! }
! catch (Exception e) {
! e.printStackTrace(System.out);
! throw new SAXException(e);
! }
}
}
!
public void characters(char[] ch, int start, int end) {
for (int i=start;i<start + end;i++) {
! currBuff.append(ch[i]);
}
}
!
/**
*Retrieves the compiled report
***************
*** 149,153 ****
return state.getReport();
}
!
/**
*Generates a full class name by capitalizing the first character of the tag and tacking
--- 187,191 ----
return state.getReport();
}
!
/**
*Generates a full class name by capitalizing the first character of the tag and tacking
|
|
From: Marc B. <big...@us...> - 2002-03-04 23:05:37
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy
In directory usw-pr-cvs1:/tmp/cvs-serv28790/src/net/sourceforge/idrs/deploy
Modified Files:
HotDeploy.java InsertToIDRS.java RMLDeploy.java
Log Message:
Completed initial xml compilation system
Index: HotDeploy.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/HotDeploy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HotDeploy.java 23 Jan 2002 13:54:08 -0000 1.2
--- HotDeploy.java 4 Mar 2002 23:05:34 -0000 1.3
***************
*** 26,30 ****
*/
public final class HotDeploy extends HttpServlet {
! String user, pass, url, className;
String[] servers;
int port;
--- 26,30 ----
*/
public final class HotDeploy extends HttpServlet {
! String user, pass, url, className,parseClass,schemaLocation,rmlTrans;
String[] servers;
int port;
***************
*** 50,53 ****
--- 50,59 ----
this.svg = svg;
+
+ this.parseClass = svg.getInitParameter("parseClass");
+
+ this.schemaLocation = svg.getInitParameter("schemaLocation");
+
+ this.rmlTrans = svg.getInitParameter("rmlTrans");
this.numServers = Integer.parseInt(svg.getInitParameter("numServers"));
***************
*** 113,117 ****
dep = new RMLDeploy(con);
!
dep.setUpdate(req.getParameter("update").equals("1"));
--- 119,126 ----
dep = new RMLDeploy(con);
! if (dep == null) System.out.println("dep null");
!
! if (req.getParameter("update") == null) System.out.println("Update null");
!
dep.setUpdate(req.getParameter("update").equals("1"));
***************
*** 126,130 ****
if (req.getParameter("usrc") != null) {
dep.setCompile(true);
! dep.setSrc(req.getParameter("src"), out);
}
--- 135,144 ----
if (req.getParameter("usrc") != null) {
dep.setCompile(true);
! //dep.setSrc(req.getParameter("src"), out);
!
!
! dep.setSrc(req.getParameter("src"),out,parseClass,rmlTrans,true,schemaLocation);
! out.flush();
!
}
Index: InsertToIDRS.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/InsertToIDRS.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InsertToIDRS.java 25 Dec 2001 06:44:00 -0000 1.2
--- InsertToIDRS.java 4 Mar 2002 23:05:34 -0000 1.3
***************
*** 31,35 ****
Connection con;
RMLDeploy dep;
!
String propsPath, DBDriver, DBName, User, Pass;
if (opts.equals("-h")) {
--- 31,38 ----
Connection con;
RMLDeploy dep;
! String schemaLocation;
! String parseClass;
! String rmlTrans;
!
String propsPath, DBDriver, DBName, User, Pass;
if (opts.equals("-h")) {
***************
*** 74,78 ****
User = dbprops.getProperty("dbuser");
Pass = dbprops.getProperty("dbpass");
!
Class.forName(DBDriver);
if (User.equalsIgnoreCase("NULL")) {
--- 77,84 ----
User = dbprops.getProperty("dbuser");
Pass = dbprops.getProperty("dbpass");
! schemaLocation = dbprops.getProperty("schemaLocation");
! parseClass = dbprops.getProperty("parseClass");
! rmlTrans = dbprops.getProperty("rmlTrans");
!
Class.forName(DBDriver);
if (User.equalsIgnoreCase("NULL")) {
***************
*** 99,110 ****
i++;
! IDRSRep report = (new IDRSCompiler(args[i], true)).setLogger(System.out).buildReport();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(report);
!
! dep.setCompile(false);
! dep.setSrc(baos.toString(),System.out);
}
if (opts.indexOf("g") != -1) {
--- 105,125 ----
i++;
! /*
! IDRSRep report = (new IDRSCompiler(args[i], true)).setLogger(System.out).buildReport();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(report);
! */
! BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(new File(args[i]))));
! String line,src="";
! while ((line = in.readLine() ) != null) {
! src += line + "\n";
! }
! in.close();
!
! dep.setCompile(true);
! PrintWriter out = new PrintWriter(System.out,true);
! dep.setSrc(src,out,parseClass,rmlTrans,true,schemaLocation);
}
if (opts.indexOf("g") != -1) {
Index: RMLDeploy.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/RMLDeploy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RMLDeploy.java 25 Dec 2001 06:44:00 -0000 1.2
--- RMLDeploy.java 4 Mar 2002 23:05:34 -0000 1.3
***************
*** 17,20 ****
--- 17,21 ----
import java.io.*;
import java.sql.*;
+ import net.sourceforge.idrs.deploy.compile.RmlCompiler;
/**
***************
*** 154,157 ****
--- 155,159 ----
try {
report = (new IDRSCompiler((String) src, false)).setLogger(logger).buildReport();
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos);
***************
*** 162,165 ****
--- 164,198 ----
catch (Exception e) {
err = false;
+ exc = e;
+ return;
+ }
+ }
+ else {
+ bytes = src.getBytes();
+ }
+
+ bais = new ByteArrayInputStream(bytes);
+ names.add("DocSrc");
+ vals.add(bais);
+ }
+
+ public void setSrc(String src,PrintWriter logger,String parseClass,String rmlTrans,boolean isFile,String rmlSchema) {
+ System.out.println("Compile : " + compile);
+ if (compile) {
+ try {
+ //report = (new IDRSCompiler((String) src, false)).setLogger(logger).buildReport();
+ RmlCompiler comp = new RmlCompiler(logger,src,parseClass,rmlTrans,isFile,rmlSchema);
+ System.out.println("Report : " + report);
+ report = comp.getReport();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(report);
+ bais = new ByteArrayInputStream(baos.toByteArray());
+ bytes=baos.toByteArray();
+ }
+ catch (Exception e) {
+
+ e.printStackTrace(logger);
+ err = true;
exc = e;
return;
|
|
From: Marc B. <big...@us...> - 2002-03-04 23:05:37
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report
In directory usw-pr-cvs1:/tmp/cvs-serv28790/src/net/sourceforge/idrs/core/report
Modified Files:
FieldChunk.class IDRSBody.class IDRSBody.java IDRSHead.class
IDRSHead.java IfChangeChunk.class IfChangeChunk.java
IfResultsChunk.java Int.class Line.java RepeatLine.class
RepeatLine.java
Log Message:
Completed initial xml compilation system
Index: FieldChunk.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/FieldChunk.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvsDL7uYY and /tmp/cvsqZvsFN differ
Index: IDRSBody.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSBody.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvsxz9Ht0 and /tmp/cvsGrbQPQ differ
Index: IDRSBody.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSBody.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IDRSBody.java 14 Sep 2001 23:46:42 -0000 1.3
--- IDRSBody.java 4 Mar 2002 23:05:34 -0000 1.4
***************
*** 2,14 ****
IDRSBody.java
Copyright (C) 2001 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
language governing rights and limitations under the License.
! */
package net.sourceforge.idrs.core.report;
--- 2,14 ----
IDRSBody.java
Copyright (C) 2001 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
language governing rights and limitations under the License.
! */
package net.sourceforge.idrs.core.report;
***************
*** 17,109 ****
/**
! IDRSBody<br>
! Encapsulates presentation logic of the IDRS through an internal list of Line objects
! */
public class IDRSBody implements Serializable{
! protected Vector lines;
! protected Vector ifs;
! protected boolean html;
! protected transient StringBuffer buffer;
! static final long serialVersionUID = 7728346799372058365L;
! /**
! This method preps the body before a report is generated
! */
! public void prepBody() {
! int i;
! IfChangeChunk ifch;
! for (i=0;i<ifs.size();i++) {
! ifch = (IfChangeChunk) ifs.elementAt(i);
! ifch.reset();
! }
! }
!
!
! /**
! Contructor, build internal lists
! */
! public IDRSBody() {
! lines = new Vector();
! ifs = new Vector();
! }
!
! /**
! Used to add Line to internal list
! @param line Line object to be added
! */
! public void addLine(Line line) {
! lines.addElement(line);
! }
!
! /**
! Used to register an "<ifchange>" tag for reset at the beginning of a report
! @param chunk IfChangeChunk to be registered
! */
! public void regIfChange(IfChangeChunk chunk) throws Exception {
! ifs.addElement(chunk);
! }
!
! /**
! Generates the results of a report
! @param head IDRSHead object to be used for business logic
! */
! public String toString(IDRSHead head) throws Exception {
! prepBody();
! buffer = new StringBuffer();
! head.setPrintTarget(buffer);
! int i = 0;
! String output = head.getText(this);
! Line ln;
! for (i=0; i< lines.size(); i++) {
! ln = (Line) lines.elementAt(i);
! if (ln == null) {
! //output += "\n";
! buffer.append("\n");
! }
! else {
! //output += ln.toString(head) + "\n";
! ln.toString(head,buffer);
! buffer.append("\n");
! }
! }
!
!
! return buffer.toString();
!
! }
!
! /**
! Defines wether or not a report is HTML
! */
! public boolean isHTML() {
! return html;
! }
!
!
! /**
! Sets wether or not a report is HTML
! @param html Wether or not report is html
! */
! public void isHTML(boolean html) {
! this.html = html;
! }
}
--- 17,136 ----
/**
! * IDRSBody<br>
! * Encapsulates presentation logic of the IDRS through an internal list of Line objects
! */
public class IDRSBody implements Serializable{
! protected transient Vector vlines;
! protected transient Vector vifs;
!
! protected Line[] lines;
! protected IfChangeChunk ifchgs[];
!
! protected boolean html;
! protected transient StringBuffer buffer;
! static final long serialVersionUID = -1199651006178322632L;
!
! /**
! * This method preps the body before a report is generated
! */
! public void prepBody() {
! int i;
! IfChangeChunk ifch;
! for (i=0;i<ifchgs.length;i++) {
! ifch = ifchgs[i];
! ifch.reset();
! }
! }
!
!
! /**
! * Contructor, build internal lists
! */
! public IDRSBody() {
! vlines = new Vector();
! vifs = new Vector();
! }
!
! /**
! * Used to add Line to internal list
! * @param line Line object to be added
! */
! public void addLine(Line line) {
! vlines.addElement(line);
! }
!
! /**
! * Used to register an "<ifchange>" tag for reset at the beginning of a report
! * @param chunk IfChangeChunk to be registered
! */
! public void regIfChange(IfChangeChunk chunk) throws Exception {
! vifs.addElement(chunk);
! }
!
! /**
! * Generates the results of a report
! * @param head IDRSHead object to be used for business logic
! */
! public String toString(IDRSHead head) throws Exception {
! prepBody();
! buffer = new StringBuffer();
! head.setPrintTarget(buffer);
! int i = 0;
! String output = head.getText(this);
! Line ln;
! System.out.println("lines : " + lines.length);
! for (i=0; i< lines.length; i++) {
! ln = lines[i];
! if (ln == null) {
! //output += "\n";
! if (buffer.charAt(buffer.length()-1)!='\n')
! buffer.append("\n");
!
! }
! else {
! //output += ln.toString(head) + "\n";
! ln.toString(head,buffer);
! if (buffer.charAt(buffer.length()-1)!='\n')
! buffer.append("\n");
! }
! }
!
!
! return buffer.toString();
!
! }
!
! /**
! * Defines wether or not a report is HTML
! */
! public boolean isHTML() {
! return html;
! }
!
!
! /**
! * Sets wether or not a report is HTML
! * @param html Wether or not report is html
! */
! public void isHTML(boolean html) {
! this.html = html;
! }
!
!
! /**
! * Sets the vector constaing the lines for the containor
! *@param lines Lines being used
! */
!
! public void setLines(Vector lines) {
! this.vlines = lines;
! }
!
! public void seal() {
! lines = new Line[vlines.size()];
! System.arraycopy(vlines.toArray(),0,lines,0,lines.length);
!
! ifchgs = new IfChangeChunk[vifs.size()];
! System.arraycopy(this.vifs.toArray(),0,ifchgs,0,ifchgs.length);
! }
}
Index: IDRSHead.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSHead.class,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
Binary files /tmp/cvsb3wPa1 and /tmp/cvsCfth0R differ
Index: IDRSHead.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSHead.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IDRSHead.java 27 Feb 2002 23:56:31 -0000 1.5
--- IDRSHead.java 4 Mar 2002 23:05:34 -0000 1.6
***************
*** 12,620 ****
public final class IDRSHead implements Serializable, IDRSScript {
! protected String header;
! protected String text;
! protected HashMap dbs;
! protected HashMap objects;
! protected String scriptClass;
! protected HashMap vars;
! protected HashMap varNames;
! protected HashMap pos;
[...1187 lines suppressed...]
! return this.send;
! }
!
! public UserInfo getUserInfo() throws Exception {
! return this.userInfo;
! }
!
! public void close() throws Exception {
! DB db;
! for (int i=0,m=dbNames.length;i<m;i++) {
! db = (DB) dbs.get(dbNames[i]);
! db.close();
! }
}
}
class Int implements Serializable {
! int v;
}
Index: IfChangeChunk.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IfChangeChunk.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvsZtEAz6 and /tmp/cvssSwFV2 differ
Index: IfChangeChunk.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IfChangeChunk.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IfChangeChunk.java 15 Sep 2001 17:33:28 -0000 1.3
--- IfChangeChunk.java 4 Mar 2002 23:05:34 -0000 1.4
***************
*** 28,35 ****
protected String current;
protected transient Vector vlines;
! protected Object[] lines;
protected boolean sealed = false;
! static final long serialVersionUID = -925936481381642752L;
/**
--- 28,35 ----
protected String current;
protected transient Vector vlines;
! protected Line[] lines;
protected boolean sealed = false;
! static final long serialVersionUID = 1456351148807430724L;
/**
***************
*** 65,69 ****
*/
public String toString(IDRSHead head,StringBuffer buffer) throws Exception {
! Line line;
//StringBuffer output = new StringBuffer("");
--- 65,70 ----
*/
public String toString(IDRSHead head,StringBuffer buffer) throws Exception {
!
! Line line;
//StringBuffer output = new StringBuffer("");
***************
*** 77,80 ****
--- 78,82 ----
run = ((! dataVal.equalsIgnoreCase(current)) || (current == null));
+
//we'll update current regardless
current = dataVal;
***************
*** 84,88 ****
int i =0;
while (i < lines.length) {
! line = (Line) lines[i];
//buffer.append( line.toString(head) );
line.toString(head,buffer);
--- 86,90 ----
int i =0;
while (i < lines.length) {
! line = lines[i];
//buffer.append( line.toString(head) );
line.toString(head,buffer);
***************
*** 102,113 ****
public void seal() {
if (! sealed) {
! lines = new Object[vlines.size()];
int i=0;
for (i=0;i<vlines.size();i++) {
! lines[i] = vlines.get(i);
! System.out.println("Line : " + i + " " + lines[i]);
if (lines[i] != null) {
! ((Line) lines[i]).seal();
}
else {
--- 104,115 ----
public void seal() {
if (! sealed) {
! lines = new Line[vlines.size()];
int i=0;
for (i=0;i<vlines.size();i++) {
! lines[i] = (Line) vlines.get(i);
!
if (lines[i] != null) {
! //((Line) lines[i]).seal();
}
else {
***************
*** 128,132 ****
public String toString(IDRSHead head) {
return "";
!
}
}
--- 130,143 ----
public String toString(IDRSHead head) {
return "";
!
}
+
+ /**
+ * Sets the vector constaing the lines for the containor
+ *@param lines Lines being used
+ */
+
+ public void setLines(Vector lines) {
+ this.vlines = lines;
+ }
}
Index: IfResultsChunk.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IfResultsChunk.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IfResultsChunk.java 15 Sep 2001 17:33:28 -0000 1.3
--- IfResultsChunk.java 4 Mar 2002 23:05:34 -0000 1.4
***************
*** 2,14 ****
IfResultsChunk.java
Copyright (C) 2001 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
language governing rights and limitations under the License.
! */
package net.sourceforge.idrs.core.report;
--- 2,14 ----
IfResultsChunk.java
Copyright (C) 2001 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
language governing rights and limitations under the License.
! */
package net.sourceforge.idrs.core.report;
***************
*** 19,147 ****
/**
! Encapsulates the <ifresults> tag
! */
public class IfResultsChunk extends Line implements Chunk, Serializable {
! protected transient Vector velines;
! protected transient Vector vdlines;
! protected Object[] elines;
! protected Object[] dlines;
! protected String dbname;
! boolean sealed=false;
!
! /**
! Initializes the chunk
! @param dbname The name of the DB to retrieve wether there were results
! */
! public IfResultsChunk(String dbname) {
! velines=new Vector();
! vdlines=new Vector();
! this.dbname=dbname;
! }
!
! /**
! Add a line to be executed when there have been results
! @param line Line to be added
! */
! public void addExecuteLine(Line line) {
! velines.add(line);
! }
!
! /**
! Add a line to be executed when there have not been results
! @param line Line to be added
! */
! public void addNoExecuteLine(Line line) {
! vdlines.add(line);
! }
!
! /**
! "Seals" the report head into static data structures from dynamic ones
! */
! public void seal() {
! if (! sealed) {
! this.elines = new Object[velines.size()];
! this.dlines = new Object[vdlines.size()];
! int i=0;
! for (i=0;i<velines.size();i++) {
! this.elines[i] = velines.get(i);
! if (elines[i] != null) {
! ((Line) elines[i]).seal();
! }
! else {
! elines[i] = new Line();
! ((Line) elines[i]).addChunk(new TextChunk(""));
! ((Line) elines[i]).seal();
! }
!
!
!
! }
!
! for (i=0;i<vdlines.size();i++) {
! this.dlines[i] = vdlines.get(i);
! if (dlines[i] != null) {
! ((Line) dlines[i]).seal();
! }
! else {
! dlines[i] = new Line();
! ((Line) dlines[i]).addChunk(new TextChunk(""));
! ((Line) dlines[i]).seal();
! }
!
!
!
! }
! sealed = true;
! velines.removeAllElements();
! vdlines.removeAllElements();
! }
! }
!
! /**
! Method called by parent to generate a string representation of this tag
! @param head The IDRSHead
! @param buffer The StringBuffer being used to buffer the output of the report
! */
! public String toString(IDRSHead head, StringBuffer buffer) throws Exception {
! DB db = head.getDB(dbname);
!
! int i =0;
! Line line;
! String ln;
!
! if (db.hasResults()) {
! while (i < this.elines.length) {
! line = (Line) elines[i];
!
! ln = line.toString(head,buffer);
! //if (ln != null)
! buffer.append("\n");
!
! i++;
! }
! }
! else {
! while (i < this.dlines.length) {
! line = (Line) dlines[i];
!
! ln = line.toString(head,buffer);
! //if (ln != null)
! buffer.append("\n");
!
! i++;
! }
}
- //return output.toString();
- return null;
- }
-
- /**
- Does nothing, fulfills Chunk interface
- */
- public String toString(IDRSHead head) {
- return "";
- }
-
}
--- 19,173 ----
/**
! * Encapsulates the <ifresults> tag
! */
public class IfResultsChunk extends Line implements Chunk, Serializable {
! protected transient boolean setYes;
! protected transient Vector velines;
! protected transient Vector vdlines;
! protected Line[] elines;
! protected Line[] dlines;
! protected String dbname;
! boolean sealed=false;
! static final long serialVersionUID = 5319630905811156732L;
! /**
! * Initializes the chunk
! * @param dbname The name of the DB to retrieve wether there were results
! */
! public IfResultsChunk(String dbname) {
! velines=new Vector();
! vdlines=new Vector();
! setYes = false;
! this.dbname=dbname;
! }
!
! /**
! * Add a line to be executed when there have been results
! * @param line Line to be added
! */
! public void addExecuteLine(Line line) {
! velines.add(line);
! }
!
! /**
! * Add a line to be executed when there have not been results
! * @param line Line to be added
! */
! public void addNoExecuteLine(Line line) {
! vdlines.add(line);
! }
!
! /**
! * "Seals" the report head into static data structures from dynamic ones
! */
! public void seal() {
! if (! sealed) {
! this.elines = new Line[velines.size()];
! this.dlines = new Line[vdlines.size()];
! int i=0;
! for (i=0;i<velines.size();i++) {
! this.elines[i] = (Line) velines.get(i);
! if (elines[i] != null) {
! //((Line) elines[i]).seal();
! }
! else {
! elines[i] = new Line();
! ((Line) elines[i]).addChunk(new TextChunk(""));
! ((Line) elines[i]).seal();
! }
!
!
!
! }
!
! for (i=0;i<vdlines.size();i++) {
! this.dlines[i] = (Line) vdlines.get(i);
! if (dlines[i] != null) {
! //((Line) dlines[i]).seal();
! }
! else {
! dlines[i] = new Line();
! ((Line) dlines[i]).addChunk(new TextChunk(""));
! ((Line) dlines[i]).seal();
! }
!
!
!
! }
! sealed = true;
! velines.removeAllElements();
! vdlines.removeAllElements();
! }
! }
!
! /**
! * Method called by parent to generate a string representation of this tag
! * @param head The IDRSHead
! * @param buffer The StringBuffer being used to buffer the output of the report
! */
! public String toString(IDRSHead head, StringBuffer buffer) throws Exception {
! DB db = head.getDB(dbname);
!
! int i =0;
! Line line;
! String ln;
!
! if (db.hasResults()) {
! while (i < this.elines.length) {
! line = elines[i];
!
! ln = line.toString(head,buffer);
! //if (ln != null)
! if (buffer.charAt(buffer.length()-1)!='\n')
! buffer.append("\n");
!
! i++;
! }
! }
! else {
! while (i < this.dlines.length) {
! line = dlines[i];
!
! ln = line.toString(head,buffer);
! //if (ln != null)
! if (buffer.charAt(buffer.length()-1)!='\n')
! buffer.append("\n");
!
! i++;
! }
! }
!
! buffer.deleteCharAt(buffer.length()-1);
!
!
! //return output.toString();
! return null;
! }
!
! /**
! Does nothing, fulfills Chunk interface
! */
! public String toString(IDRSHead head) {
! return "";
! }
!
! /**
! * Sets the vector constaing the lines for the containor
! *@param lines Lines being used
! */
!
! public void setLines(Vector lines) {
! if (! setYes) {
! this.velines = lines;
! setYes = true;
! System.out.println("Set Yes");
! }
! else {
! this.vdlines = lines;
! System.out.println("Set No");
! }
!
!
}
}
Index: Int.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/Int.class,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
Binary files /tmp/cvsTmUuu9 and /tmp/cvs6QljP8 differ
Index: Line.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/Line.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Line.java 15 Sep 2001 17:33:28 -0000 1.3
--- Line.java 4 Mar 2002 23:05:34 -0000 1.4
***************
*** 23,28 ****
public class Line implements Serializable {
protected transient Vector vchunks; //this array holds all of the chuncks for a given line
! protected Object[] chunks;
! static final long serialVersionUID = -8504813097021808175L;
--- 23,28 ----
public class Line implements Serializable {
protected transient Vector vchunks; //this array holds all of the chuncks for a given line
! protected Chunk[] chunks;
! static final long serialVersionUID = 786019973821495030L;
***************
*** 53,57 ****
Chunk ch;
for (int i=0; i<chunks.length;i++) {
! ch = (Chunk) chunks[i];
buffer.append(ch.toString(head));
}
--- 53,57 ----
Chunk ch;
for (int i=0; i<chunks.length;i++) {
! ch = chunks[i];
buffer.append(ch.toString(head));
}
***************
*** 93,101 ****
public void seal() {
! chunks = new Object[vchunks.size()];
int i=0;
for (i=0;i<vchunks.size();i++) {
! chunks[i] = vchunks.get(i);
}
vchunks.removeAllElements();
--- 93,101 ----
public void seal() {
! chunks = new Chunk[vchunks.size()];
int i=0;
for (i=0;i<vchunks.size();i++) {
! chunks[i] = (Chunk) vchunks.get(i);
}
vchunks.removeAllElements();
Index: RepeatLine.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/RepeatLine.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvsjxTsbc and /tmp/cvsAOvwXd differ
Index: RepeatLine.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/RepeatLine.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RepeatLine.java 21 Sep 2001 13:55:38 -0000 1.4
--- RepeatLine.java 4 Mar 2002 23:05:34 -0000 1.5
***************
*** 2,14 ****
RepeatLine.java
Copyright (C) 2001 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
language governing rights and limitations under the License.
! */
--- 2,14 ----
RepeatLine.java
Copyright (C) 2001 Marc Boorshtein
!
! The contents of this file are subject to the Mozilla Public License Version 1.0 (the License);
! you may not use this file except in compliance with the License. You may obtain a copy of the
License at http://www.mozilla.org/MPL/
!
! Software distributed under the License is distributed on an "AS IS" basis,
! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific
language governing rights and limitations under the License.
! */
***************
*** 20,185 ****
/**
! Encapsulates the <repeat> tag
! */
public class RepeatLine extends Line implements Serializable, Chunk {
! int lineNum;
! String color1;
! String color2;
! String id;
! transient Vector vlines;
! boolean sealed = false;
! Object[] lines;
! static final long serialVersionUID = -7969399508243503007L;
! /**
Initializes the RepeatLine
! @param id ID of DB being iterated through
! @param color1 First forecolor used
! @param color2 First backcolor used
! */
! public RepeatLine(String id, String color1, String color2) {
! //this contructor initializes the size of the line
! this.color1 = color1;
! this.color2 = color2;
! this.id = id;
! vlines = new Vector();
! }
!
! /**
Adds a line to the <repeat>
! @param line Line to add
! */
! public void addLine(Line line) {
! vlines.add(line);
! }
!
! /**
Public method to retrieve the information about the all of the Chunks stored in the Line
! @param head IDRSHead of report
! @param buffer Buffered output of report
! */
! public String toString(IDRSHead head, StringBuffer buffer) throws Exception {
! DB db = head.getDB(id);
! lineNum = 0;
! int i =0;
! Line line;
! String ln;
! //StringBuffer output = new StringBuffer("");
! while (db.next()) {
! while (i < this.lines.length) {
! line = (Line) lines[i];
!
! ln = line.toString(head,buffer);
! //if (ln != null)
! buffer.append("\n");
!
! i++;
! }
! i=0;
! lineNum++;
}
- lineNum=0;
! //return output.toString();
! return null;
! }
!
!
!
! /**
Wether or not the set should has another results
! @param db DB being inspected
! */
! protected boolean rsContinue(DB db) throws Exception {
! boolean ok;
! boolean hasNext;
! if (db.getIsPaged()) {
! //hasNext = db.next();
!
!
!
! return ((db.getNumRecs() > (db.getCurrLocation() - db.getFirstRec())) && db.next());
!
! }
! else {
! return (db.next());
}
! }
!
! /**
Retrieves current forecolor
! */
! public String getForeColor() {
! System.out.println("Line Num : " + lineNum);
! System.out.println("Color1 : " + color1);
! System.out.println("Color2 : " + color2);
! if (lineNum % 2 == 0) {
! return color1;
! }
! else {
! return color2;
! }
! }
!
! /**
Retrieves current backcolor
! */
! public String getBackColor() {
! System.out.println("Line Num : " + lineNum);
! System.out.println("Color1 : " + color1);
! System.out.println("Color2 : " + color2);
! if (lineNum % 2 != 0) {
! return color1;
! }
! else {
! return color2;
! }
! }
!
! /**
Retrieves current line number
! */
! public int getLineNum() {
! return lineNum;
! }
!
/**
! "Seals" the report head into static data structures from dynamic ones
! */
! public void seal() {
! if (! sealed) {
! this.lines = new Object[vlines.size()];
!
! int i=0;
! for (i=0;i<vlines.size();i++) {
! this.lines[i] = vlines.get(i);
! if (lines[i] != null) {
! ((Line) lines[i]).seal();
! }
! else {
! lines[i] = new Line();
! ((Line) lines[i]).addChunk(new TextChunk(""));
! ((Line) lines[i]).seal();
! }
!
!
!
! }
! sealed = true;
! vlines.removeAllElements();
! }
!
!
! }
!
! /**
! Does nothing, fulfills Chunk interface
! */
! public String toString(IDRSHead head) {
! return "";
!
! }
!
}
--- 20,203 ----
/**
! * Encapsulates the <repeat> tag
! */
public class RepeatLine extends Line implements Serializable, Chunk {
! int lineNum;
! String color1;
! String color2;
! String id;
! transient Vector vlines;
! boolean sealed = false;
! Line[] lines;
! static final long serialVersionUID = 45361395890117839L;
! /**
Initializes the RepeatLine
! @param id ID of DB being iterated through
! @param color1 First forecolor used
! @param color2 First backcolor used
! */
! public RepeatLine(String id, String color1, String color2) {
! //this contructor initializes the size of the line
!
! this.color1 = color1;
! this.color2 = color2;
! this.id = id;
! vlines = new Vector();
! }
! /*
Adds a line to the <repeat>
! *@param lines Lines being used
!
!
! public void setLines(Vector lines) {
! this.lines = lines;
! }*/
!
! /**
! * Sets the vector constaing the lines for the containor
! @param line Line to add
! */
! public void addLine(Line line) {
! vlines.add(line);
! }
!
! /**
Public method to retrieve the information about the all of the Chunks stored in the Line
! @param head IDRSHead of report
! @param buffer Buffered output of report
! */
! public String toString(IDRSHead head, StringBuffer buffer) throws Exception {
! DB db = head.getDB(id);
! lineNum = 0;
! int i =0;
! Line line;
! String ln;
! //StringBuffer output = new StringBuffer("");
! while (db.next()) {
! while (i < this.lines.length) {
! line = lines[i];
!
! ln = line.toString(head,buffer);
! //if (ln != null)
! if (buffer.charAt(buffer.length()-1)!='\n')
! buffer.append("\n");
!
! i++;
! }
!
! i=0;
! lineNum++;
! }
! buffer.deleteCharAt(buffer.length()-1);
! lineNum=0;
!
! //return output.toString();
! return null;
}
!
! /**
Wether or not the set should has another results
! @param db DB being inspected
! */
! protected boolean rsContinue(DB db) throws Exception {
! boolean ok;
! boolean hasNext;
! if (db.getIsPaged()) {
! //hasNext = db.next();
!
!
!
! return ((db.getNumRecs() > (db.getCurrLocation() - db.getFirstRec())) && db.next());
!
! }
! else {
! return (db.next());
! }
}
!
! /**
Retrieves current forecolor
! */
! public String getForeColor() {
!
! if (lineNum % 2 == 0) {
! return color1;
! }
! else {
! return color2;
! }
! }
!
! /**
Retrieves current backcolor
! */
! public String getBackColor() {
!
! if (lineNum % 2 != 0) {
! return color1;
! }
! else {
! return color2;
! }
! }
!
! /**
Retrieves current line number
! */
! public int getLineNum() {
! return lineNum;
! }
!
/**
! * "Seals" the report head into static data structures from dynamic ones
! */
! public void seal() {
! if (! sealed) {
!
! this.lines = new Line[vlines.size()];
!
! int i=0;
! for (i=0;i<vlines.size();i++) {
! this.lines[i] = (Line) vlines.get(i);
! if (lines[i] != null) {
! //((Line) lines[i]).seal();
! }
! else {
! lines[i] = new Line();
! ((Line) lines[i]).addChunk(new TextChunk(""));
! ((Line) lines[i]).seal();
! }
!
!
!
! }
! sealed = true;
! vlines.removeAllElements();
! }
!
!
! }
!
! /**
! * Does nothing, fulfills Chunk interface
! */
! public String toString(IDRSHead head) {
!
! System.out.println("in RepeatLine toString()");
! return "";
! }
!
! /**
! * Sets the vector constaing the lines for the containor
! *@param lines Lines being used
! */
!
! public void setLines(Vector lines) {
! this.vlines = lines;
! }
!
}
|
|
From: Marc B. <big...@us...> - 2002-03-04 23:05:37
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet
In directory usw-pr-cvs1:/tmp/cvs-serv28790/src/net/sourceforge/idrs/core/servlet
Modified Files:
IDRSServlet.java
Log Message:
Completed initial xml compilation system
Index: IDRSServlet.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/IDRSServlet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** IDRSServlet.java 27 Feb 2002 23:56:31 -0000 1.9
--- IDRSServlet.java 4 Mar 2002 23:05:34 -0000 1.10
***************
*** 690,693 ****
--- 690,694 ----
public void destroy() {
//de-initalization code needs to be written, we should clean up after our selves
+ resetThread.stop();
super.destroy();
}
|
|
From: Marc B. <big...@us...> - 2002-03-04 23:05:36
|
Update of /cvsroot/idrs/Idrs/dev/lib In directory usw-pr-cvs1:/tmp/cvs-serv28790/lib Modified Files: idrs.jar Log Message: Completed initial xml compilation system Index: idrs.jar =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/lib/idrs.jar,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvszEfpNs and /tmp/cvsqDjrIK differ |
|
From: Marc B. <big...@us...> - 2002-02-27 23:56:36
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils In directory usw-pr-cvs1:/tmp/cvs-serv12455/dev/src/net/sourceforge/idrs/utils Modified Files: Application.class CleanUp.class DB.class IDRSPrinter.class ObjectStore.class RS.class RSMetaData.class ReqAttr.class ReqReq.class RequestWrapper.class UserInfo.class Log Message: Added upload support! Thanks to Dane Foster and Equity Technology Group for posting their code on sourceforge! Index: Application.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/Application.class,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvst8bWew and /tmp/cvs4lFmmS differ Index: CleanUp.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/CleanUp.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsifllrv and /tmp/cvsgfoSJQ differ Index: DB.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/DB.class,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsTtfXVw and /tmp/cvsGRxiuV differ Index: IDRSPrinter.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/IDRSPrinter.class,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsVXZVWx and /tmp/cvsM0h1BV differ Index: ObjectStore.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/ObjectStore.class,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvs5Nl2yz and /tmp/cvskW1GTY differ Index: RS.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/RS.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsUgyRYA and /tmp/cvsyAojM1 differ Index: RSMetaData.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/RSMetaData.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsouoc6z and /tmp/cvsA1Jq4Z differ Index: ReqAttr.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/ReqAttr.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsdIsBKB and /tmp/cvsAWhde3 differ Index: ReqReq.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/ReqReq.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsiosZbD and /tmp/cvsuudag6 differ Index: RequestWrapper.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/RequestWrapper.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsm9OsjC and /tmp/cvs2xnlu4 differ Index: UserInfo.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/UserInfo.class,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsKIYJOD and /tmp/cvsWwZCn7 differ |
|
From: Marc B. <big...@us...> - 2002-02-27 23:56:36
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/embedable
In directory usw-pr-cvs1:/tmp/cvs-serv12455/dev/src/net/sourceforge/idrs/script/embedable
Modified Files:
IDRSBeanShell.class IDRSJPython.class IDRSScriptLanguage.class
IDRSShell.class IDRSShell.java
Log Message:
Added upload support! Thanks to Dane Foster and Equity Technology Group for posting their code on sourceforge!
Index: IDRSBeanShell.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/embedable/IDRSBeanShell.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsLOc0to and /tmp/cvsi7yTPC differ
Index: IDRSJPython.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/embedable/IDRSJPython.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsqEH10p and /tmp/cvsu8vOLF differ
Index: IDRSScriptLanguage.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/embedable/IDRSScriptLanguage.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsSFCrsr and /tmp/cvsktEcMI differ
Index: IDRSShell.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/embedable/IDRSShell.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsMBNlQq and /tmp/cvswrjGpH differ
Index: IDRSShell.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/embedable/IDRSShell.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IDRSShell.java 18 Sep 2001 03:18:57 -0000 1.3
--- IDRSShell.java 27 Feb 2002 23:56:32 -0000 1.4
***************
*** 17,21 ****
import javax.servlet.*;
import java.io.PrintWriter;
!
import net.sourceforge.idrs.utils.Application;
import net.sourceforge.idrs.utils.UserInfo;
--- 17,21 ----
import javax.servlet.*;
import java.io.PrintWriter;
! import net.sourceforge.idrs.core.servlet.MultiPartRequest;
import net.sourceforge.idrs.utils.Application;
import net.sourceforge.idrs.utils.UserInfo;
***************
*** 141,144 ****
--- 141,151 ----
return idrs.getUserInfo();
}
+
+ /**
+ *Retrieves the MultiPartRequest if it exists
+ */
+ public MultiPartRequest getMultiPartRequest() throws Exception {
+ return idrs.getMultiPartRequest();
+ }
}
|
|
From: Marc B. <big...@us...> - 2002-02-27 23:56:36
|
Update of /cvsroot/idrs/Idrs/dev/xml In directory usw-pr-cvs1:/tmp/cvs-serv12455/dev/xml Modified Files: rmlTrans.xml Log Message: Added upload support! Thanks to Dane Foster and Equity Technology Group for posting their code on sourceforge! Index: rmlTrans.xml =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/xml/rmlTrans.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rmlTrans.xml 25 Jan 2002 14:49:03 -0000 1.1 --- rmlTrans.xml 27 Feb 2002 23:56:32 -0000 1.2 *************** *** 7,11 **** <trans:rml simple="false" ownLine="true" >head</trans:rml> <trans:rml simple="true" ownLine="true" >object</trans:rml> ! <trans:rml simple="true" ownLine="false" >class</trans:rml> <trans:rml simple="true" ownLine="true">constructor</trans:rml> <trans:rml simple="true" ownLine="false">vartype</trans:rml> --- 7,11 ---- <trans:rml simple="false" ownLine="true" >head</trans:rml> <trans:rml simple="true" ownLine="true" >object</trans:rml> ! <trans:rml simple="true" ownLine="false" represent="className" >class</trans:rml> <trans:rml simple="true" ownLine="true">constructor</trans:rml> <trans:rml simple="true" ownLine="false">vartype</trans:rml> |
|
From: Marc B. <big...@us...> - 2002-02-27 23:56:36
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script
In directory usw-pr-cvs1:/tmp/cvs-serv12455/dev/src/net/sourceforge/idrs/script
Modified Files:
DBShell.class IDRSScript.class IDRSScript.java IdrsDB.class
Log Message:
Added upload support! Thanks to Dane Foster and Equity Technology Group for posting their code on sourceforge!
Index: DBShell.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/DBShell.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsapvkIj and /tmp/cvsasO6it differ
Index: IDRSScript.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/IDRSScript.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvsG01Lkl and /tmp/cvsAbyYow differ
Index: IDRSScript.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/IDRSScript.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IDRSScript.java 22 Jan 2002 12:20:29 -0000 1.4
--- IDRSScript.java 27 Feb 2002 23:56:32 -0000 1.5
***************
*** 22,25 ****
--- 22,27 ----
import net.sourceforge.idrs.utils.IDRSPrinter;
import net.sourceforge.idrs.utils.UserInfo;
+ import net.sourceforge.idrs.core.servlet.MultiPartRequest;
+
public interface IDRSScript {
/**
***************
*** 105,108 ****
--- 107,115 ----
*/
public UserInfo getUserInfo() throws Exception;
+
+ /**
+ *Retrieves the MultiPartRequest if it exists
+ */
+ public MultiPartRequest getMultiPartRequest() throws Exception;
Index: IdrsDB.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/script/IdrsDB.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsZ0OWYl and /tmp/cvsqxzSPx differ
|
|
From: Marc B. <big...@us...> - 2002-02-27 23:56:36
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/pool In directory usw-pr-cvs1:/tmp/cvs-serv12455/dev/src/net/sourceforge/idrs/utils/pool Modified Files: ObjectPool.class POS.class PooledObject.class Log Message: Added upload support! Thanks to Dane Foster and Equity Technology Group for posting their code on sourceforge! Index: ObjectPool.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/pool/ObjectPool.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs6lxfFC and /tmp/cvsGu6S54 differ Index: POS.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/pool/POS.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs1b2TpF and /tmp/cvsStKgia differ Index: PooledObject.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/utils/pool/PooledObject.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvspeP6sG and /tmp/cvsMgvpOc differ |
|
From: Marc B. <big...@us...> - 2002-02-27 23:56:36
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/jdbc In directory usw-pr-cvs1:/tmp/cvs-serv12455/dev/src/net/sourceforge/idrs/jdbc Modified Files: JDBCInfo.class JDBCPool.class Log Message: Added upload support! Thanks to Dane Foster and Equity Technology Group for posting their code on sourceforge! Index: JDBCInfo.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/jdbc/JDBCInfo.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsJrMKmg and /tmp/cvsMIo5sm differ Index: JDBCPool.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/jdbc/JDBCPool.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsYWyyXh and /tmp/cvsYpGKFp differ |
|
From: Marc B. <big...@us...> - 2002-02-27 23:56:35
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile
In directory usw-pr-cvs1:/tmp/cvs-serv12455/dev/src/net/sourceforge/idrs/deploy/compile
Modified Files:
Compiler.java CompilerState.java
Log Message:
Added upload support! Thanks to Dane Foster and Equity Technology Group for posting their code on sourceforge!
Index: Compiler.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/Compiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Compiler.java 4 Feb 2002 04:26:45 -0000 1.2
--- Compiler.java 27 Feb 2002 23:56:31 -0000 1.3
***************
*** 32,36 ****
*allows for a compiler to use the attributes of the calling tag
*/
! public void setAttributes(Attributes atts) {
this.atts = atts;
}
--- 32,36 ----
*allows for a compiler to use the attributes of the calling tag
*/
! public void setAttributes(Attributes atts) throws Exception {
this.atts = atts;
}
***************
*** 39,43 ****
*allows for the compiler to work with the current state of the page compilation
*/
! public void setState(CompilerState state) {
this.state = state;
}
--- 39,43 ----
*allows for the compiler to work with the current state of the page compilation
*/
! public void setState(CompilerState state) throws Exception {
this.state = state;
}
***************
*** 46,50 ****
*allows for the execution of any wrap-up code at the hitting of the end tag
*/
! public abstract void seal();
}
--- 46,50 ----
*allows for the execution of any wrap-up code at the hitting of the end tag
*/
! public abstract void seal() throws Exception;
}
Index: CompilerState.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/CompilerState.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompilerState.java 30 Jan 2002 01:43:13 -0000 1.1
--- CompilerState.java 27 Feb 2002 23:56:31 -0000 1.2
***************
*** 9,25 ****
import java.util.*;
import net.sourceforge.idrs.core.report.*;
!
/**
*
* @author mlb
! * @version
*/
public class CompilerState {
!
java.util.Stack nodes;
Line currentLine;
RepeatLine currRepLine;
IDRSRep rep;
/** Creates new CompilerState */
--- 9,28 ----
import java.util.*;
import net.sourceforge.idrs.core.report.*;
! import net.sourceforge.idrs.utils.*;
! import net.sourceforge.idrs.script.*;
! import net.sourceforge.idrs.script.embedable.*;
/**
*
* @author mlb
! * @version
*/
public class CompilerState {
!
java.util.Stack nodes;
Line currentLine;
RepeatLine currRepLine;
IDRSRep rep;
+ HashMap comp_atts;
/** Creates new CompilerState */
***************
*** 27,30 ****
--- 30,35 ----
rep = new IDRSRep(new IDRSHead(),new IDRSBody());
nodes = new Stack();
+ comp_atts = new HashMap();
+
}
***************
*** 55,58 ****
--- 60,66 ----
*/
public Line getCurrentLine() {
+ if (currentLine == null) {
+ this.currentLine = new Line();
+ }
return this.currentLine;
}
***************
*** 72,76 ****
}
-
}
--- 80,162 ----
}
+ public Class getClass(String type) throws Exception {
+ if (type.equalsIgnoreCase("int") ){
+ return Class.forName("java.lang.Integer");
+ }
+ else if (type.equalsIgnoreCase("string")) {
+ return Class.forName("java.lang.String");
+ }
+ else if (type.equalsIgnoreCase("date")) {
+ return java.sql.Date.class;
+ }
+ else if (type.equalsIgnoreCase("time")) {
+ return java.sql.Time.class;
+ }
+ else if (type.equalsIgnoreCase("userid")) {
+ return java.lang.Integer.class;
+ }
+ else if (type.equalsIgnoreCase("connection")) {
+ return java.sql.Connection.class;
+ }
+ else if (type.equalsIgnoreCase("boolean")) {
+ return java.lang.Boolean.class ;
+ }
+ else if (type.equalsIgnoreCase("float")) {
+ return java.lang.Float.class;
+ }
+ else if (type.equalsIgnoreCase("dataset")) {
+ return IdrsDB.class;
+ }
+ else if (type.equalsIgnoreCase("scripter")) {
+ return IDRSScript.class;
+ }
+ else
+ return null;
+
+ }
+
+ public void setAttribute(String id, Object val) {
+ this.comp_atts.put(id,val);
+ }
+
+ public Object getAttribute(String id) {
+ return this.comp_atts.get(id);
+ }
+
+ /**
+ *Seals the current line and adds it to the body
+ */
+ public void sealLine() {
+
+
+ this.currentLine.seal();
+
+ if (this.currRepLine != null) {
+ this.currRepLine.addLine(this.currentLine);
+ }
+ else {
+ this.rep.getBody().addLine(this.currentLine);
+ }
+
+ this.currentLine = null;
+ }
+
+ public void addRepeatLine(String id, String color1, String color2) throws Exception {
+ this.currentLine = new RepeatLine(id,color1,color2);
+ }
+
+ public void setRepeatLine() {
+ this.currRepLine.seal();
+ this.rep.getBody().addLine(this.currRepLine);
+ this.currRepLine = null;
+ }
+
+
+ /**
+ *This allows for the setting of the current line
+ */
+ public void setLine(Line line) {
+ this.currentLine = line;
+ }
}
|
|
From: Marc B. <big...@us...> - 2002-02-27 23:56:35
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro
In directory usw-pr-cvs1:/tmp/cvs-serv12455/dev/src/net/sourceforge/idrs/deploy/macro
Modified Files:
MacroToXML.class MacroToXMLHandler.java
Log Message:
Added upload support! Thanks to Dane Foster and Equity Technology Group for posting their code on sourceforge!
Index: MacroToXML.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro/MacroToXML.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
Binary files /tmp/cvsspXLga and /tmp/cvsktlEia differ
Index: MacroToXMLHandler.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro/MacroToXMLHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MacroToXMLHandler.java 23 Jan 2002 19:46:44 -0000 1.6
--- MacroToXMLHandler.java 27 Feb 2002 23:56:31 -0000 1.7
***************
*** 32,36 ****
RML_TRANS = "rmltrans",
IS_SIMPLE = "simple",
! OWN_LINE = "ownLine";
String nameSpace,rmlSchema,textTag,scriptTag,echoScriptTag;
--- 32,37 ----
RML_TRANS = "rmltrans",
IS_SIMPLE = "simple",
! OWN_LINE = "ownLine",
! REPRESENT = "represent";
String nameSpace,rmlSchema,textTag,scriptTag,echoScriptTag;
***************
*** 63,71 ****
public void endElement(String namespaceURI, String localName, String rawName) throws SAXException {
String name = localName.toLowerCase();
!
if (name.equals(RML)) {
System.out.println("Found Tag : " + currBuff.toString().trim().toLowerCase());
!
! rmlTags.put(currBuff.toString().trim().toLowerCase(),new Tag(currBuff.toString().trim(), Boolean.valueOf(atts.getValue(IS_SIMPLE)).booleanValue(), Boolean.valueOf(atts.getValue(OWN_LINE)).booleanValue()));
}
else if (name.equals(TEXT_TAG)) {
--- 64,74 ----
public void endElement(String namespaceURI, String localName, String rawName) throws SAXException {
String name = localName.toLowerCase();
! String rep;
!
if (name.equals(RML)) {
System.out.println("Found Tag : " + currBuff.toString().trim().toLowerCase());
! rep = atts.getValue(REPRESENT);
!
! rmlTags.put(currBuff.toString().trim().toLowerCase(),new Tag(rep==null ? currBuff.toString().trim() : rep, Boolean.valueOf(atts.getValue(IS_SIMPLE)).booleanValue(), Boolean.valueOf(atts.getValue(OWN_LINE)).booleanValue()));
}
else if (name.equals(TEXT_TAG)) {
|
|
From: Marc B. <big...@us...> - 2002-02-27 23:56:35
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/compile/units
In directory usw-pr-cvs1:/tmp/cvs-serv12455/dev/src/net/sourceforge/idrs/deploy/compile/units
Added Files:
Body.java Constructor.java Db.java Head.java Method.java
Object.java Repeat.java Rml.java SQL.java StoredProc.java
VarList.java
Log Message:
Added upload support! Thanks to Dane Foster and Equity Technology Group for posting their code on sourceforge!
--- NEW FILE: Body.java ---
/*
* Body.java
*
* Created on February 12, 2002, 12:56 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import java.util.*;
import net.sourceforge.idrs.core.report.*;
import net.sourceforge.idrs.deploy.compile.Compiler;
import net.sourceforge.idrs.deploy.compile.CompilerState;
import net.sourceforge.idrs.utils.ObjectStore;
/**
*
* @author mlb
* @version
*/
public class Body extends net.sourceforge.idrs.deploy.compile.Compiler {
/** Creates new Body */
public Body() {
}
/**
*allows for a compiler to use the attributes of the calling tag
*/
public void setAttributes(Attributes atts) throws Exception {
super.setAttributes(atts);
state.sealLine();
if (state.getReport().getBody().isHTML()) {
Line line = state.getCurrentLine();
line.addChunk(new net.sourceforge.idrs.core.report.TextChunk("<BODY "));
for (int i=0,m=atts.getLength();i<m;i++) {
line.addChunk(new TextChunk(atts.getLocalName(i) + "=\"" + atts.getValue(i) + "\" "));
}
line.addChunk(new TextChunk(">"));
state.sealLine();
}
}
public void useMethod(String val,Attributes atts) throws Exception {
String objid = atts.getValue("objid");
String varlistId = atts.getValue("varlist");
LinkedList varList = (LinkedList) ((HashMap) state.getAttribute("IDRS_VAR_LISTS")).get(varlistId);
Line curr = state.getCurrentLine();
curr.addChunk(new ObjectChunk(val,varList.toArray(),varlistId,objid));
}
public void field(String val,Attributes atts) throws Exception {
String format = atts.getValue("format");
String id, field;
id = val.substring(0,val.indexOf("."));
field = val.substring(val.indexOf(".")+1);
Line line = state.getCurrentLine();
line.addChunk(new net.sourceforge.idrs.core.report.FieldChunk(id,field,format,state.getCurrentRepeatLine()));
}
public void inputResults(String val,Attributes atts) throws Exception {
Line line = state.getCurrentLine();
line.addChunk(new net.sourceforge.idrs.core.report.InputResultsChunk(val));
}
public void script(String val, Attributes atts) throws Exception {
state.getCurrentLine().addChunk(new net.sourceforge.idrs.core.report.ShortScriptChunk(val));
}
public void evalScript(String val,Attributes atts) throws Exception {
state.getCurrentLine().addChunk(new net.sourceforge.idrs.core.report.EvalScriptChunk(val));
}
public void text(String val,Attributes atts) throws Exception {
if (val.indexOf('\n') != -1) {
StringTokenizer tok = new StringTokenizer(val,"\n",false);
Line line;
while (tok.hasMoreTokens()) {
line = state.getCurrentLine();
line.addChunk(new net.sourceforge.idrs.core.report.TextChunk(tok.nextToken()));
state.sealLine();
}
}
else {
state.getCurrentLine().addChunk(new TextChunk(val));
}
}
/**
* allows for the execution of any wrap-up code at the hitting of the end tag
*/
public void seal() throws Exception {
}
}
--- NEW FILE: Constructor.java ---
/*
* Constructor.java
*
* Created on February 6, 2002, 3:26 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import java.util.*;
import net.sourceforge.idrs.core.report.*;
import net.sourceforge.idrs.deploy.compile.Compiler;
import net.sourceforge.idrs.deploy.compile.CompilerState;
import net.sourceforge.idrs.utils.ObjectStore;
/**
* Encapulates an Object's constructor
* @author Marc Boorshtein
*/
public class Constructor extends net.sourceforge.idrs.deploy.compile.Compiler {
protected ObjectStore obj;
protected LinkedList list;
/** Creates new Constructor */
public Constructor() {
list = new LinkedList();
}
/**
* allows for the execution of any wrap-up code at the hitting of the end tag
*/
public void seal() throws Exception {
Class cls[] = new Class[list.size()];
System.arraycopy(list.toArray(),0,cls,0,list.size());
obj.firstInitiate(cls);
}
/**
* allows for a compiler to use the attributes of the calling tag
*@param atts Tag Attributes
*/
public void setAttributes(Attributes atts) throws Exception {
super.setAttributes(atts);
obj = ((net.sourceforge.idrs.deploy.compile.units.Object) this.state.peekNode()).getObjectStore();
}
/**
*Handles the vartype tag
*@param val Value of tag
*@param atts Tag attributes
*/
public void varType(String val, Attributes atts) throws Exception {
list.add(state.getClass(val));
}
}
--- NEW FILE: Db.java ---
/*
* Db.java
*
* Created on February 6, 2002, 3:50 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import java.util.*;
import net.sourceforge.idrs.core.report.*;
import net.sourceforge.idrs.deploy.compile.Compiler;
import net.sourceforge.idrs.deploy.compile.CompilerState;
import net.sourceforge.idrs.utils.*;
/**
*
* @author mlb
* @version
*/
public class Db extends net.sourceforge.idrs.deploy.compile.Compiler {
DB db;
String id;
/** Creates new Db */
public Db() {
}
/**
* allows for the execution of any wrap-up code at the hitting of the end tag
*/
public void seal() throws Exception {
db.seal();
this.state.getReport().getHead().addDB(db);
}
/**
* allows for a compiler to use the attributes of the calling tag
*/
public void setAttributes(Attributes atts) throws Exception {
super.setAttributes(atts);
id = atts.getValue("id");
db = new DB(id);
}
public void dbName(String val, Attributes atts) throws Exception {
db.setDBName(val);
}
public void dbDriver(String val, Attributes atts) throws Exception {
db.setDBDriver(val);
}
public void dbUser(String val, Attributes atts) throws Exception {
db.setUserName(val);
}
public void dbPass(String val, Attributes atts) throws Exception {
db.setPassword(val);
}
public void dirrection(String val, Attributes att) throws Exception {
db.setDirection( val.equalsIgnoreCase("INPUT") ? DB.INPUT : DB.OUTPUT);
}
public void useDB(String val, Attributes atts) throws Exception {
db.setDBName(this.state.getReport().getHead().getDB(val).getDBName(),false);
}
public void useMethod(String val, Attributes atts) throws Exception {
String objid;
ObjectStore obj;
objid = atts.getValue("objid");
obj = this.state.getReport().getHead().getObjectStore(objid);
db.setType(DB.METHOD);
db.setObjectStore(obj);
db.setMethodName(val);
}
public net.sourceforge.idrs.utils.DB getDB() {
return this.db;
}
}
--- NEW FILE: Head.java ---
/*
* Head.java
*
* Created on February 4, 2002, 9:05 AM
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import java.util.*;
import net.sourceforge.idrs.core.report.*;
import net.sourceforge.idrs.deploy.compile.Compiler;
import net.sourceforge.idrs.deploy.compile.CompilerState;
public class Head extends net.sourceforge.idrs.deploy.compile.Compiler {
/** Creates new Head */
public Head() {
}
/**
* allows for the execution of any wrap-up code at the hitting of the end tag
*/
public void seal() throws Exception {
if (this.state.getReport().getBody().isHTML()) {
this.state.getReport().getHead().addText("</HEAD>");
}
this.state.getReport().getHead().seal();
}
/**
* allows for a compiler to use the attributes of the calling tag
*/
public void setAttributes(Attributes atts) throws Exception {
String tag;
int i;
if (this.state.getReport().getBody().isHTML()) {
tag = "<HEAD ";
for (i=0; i < atts.getLength(); i++) {
tag += atts.getLocalName(i) + "=\"" + atts.getValue(i) + "\" ";
}
tag += ">";
this.state.getReport().getHead().addText(tag);
}
}
public void text(java.lang.String val, Attributes atts) throws Exception {
this.state.getReport().getHead().addText(val);
}
}
--- NEW FILE: Method.java ---
/*
* Method.java
*
* Created on February 6, 2002, 3:41 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import java.util.*;
import net.sourceforge.idrs.core.report.*;
import net.sourceforge.idrs.deploy.compile.Compiler;
import net.sourceforge.idrs.deploy.compile.CompilerState;
import net.sourceforge.idrs.utils.ObjectStore;
/**
* Encapsulates the method tag
* @author Marc Boorshtein
*/
public class Method extends net.sourceforge.idrs.deploy.compile.units.Constructor {
String name;
/** Creates new Method */
public Method() {
super();
}
/**
* allows for the execution of any wrap-up code at the hitting of the end tag
*/
public void seal() throws Exception {
Class cls[] = new Class[list.size()];
System.arraycopy(list.toArray(),0,cls,0,list.size());
obj.addMethod(name,cls);
}
/**
* allows for the compiler to work with the current state of the page compilation
*@param state The CompilerState object
*/
public void setState(CompilerState state) throws Exception {
super.setState(state);
}
/**
*name tag
*@param val Value of tag
*@param atts Tag attributes
*/
public void name(String val, Attributes atts) {
this.name=name;
}
}
--- NEW FILE: Object.java ---
/*
* Object.java
*
* Created on February 6, 2002, 2:59 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import java.util.*;
import net.sourceforge.idrs.core.report.*;
import net.sourceforge.idrs.deploy.compile.Compiler;
import net.sourceforge.idrs.deploy.compile.CompilerState;
import net.sourceforge.idrs.utils.ObjectStore;
/**
* Encapsulates the object tag
* @author Marc Boorshtein
*/
public class Object extends net.sourceforge.idrs.deploy.compile.Compiler {
String id;
ObjectStore obj;
/** Creates new Object */
public Object() {
}
/**
* allows for the execution of any wrap-up code at the hitting of the end tag
*/
public void seal() throws Exception {
obj.seal();
this.state.getReport().getHead().addObject(obj);
}
/**
* allows for a compiler to use the attributes of the calling tag
*@param atts Tag attributes
*/
public void setAttributes(Attributes atts) throws Exception {
super.setAttributes(atts);
this.id = atts.getValue("id");
this.obj = new ObjectStore(id);
}
/**
*sets the class name
*@param val Value of tag
*@param atts Tag attributes
*/
public void className (java.lang.String val, Attributes atts) throws Exception {
obj.setClassName(val);
}
/**
*Returns the current ObjectStore
*@return current ObjectStore instance
*/
public ObjectStore getObjectStore(){
return this.obj;
}
}
--- NEW FILE: Repeat.java ---
/*
* Repeat.java
*
* Created on February 19, 2002, 1:28 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import java.util.*;
import net.sourceforge.idrs.core.report.*;
import net.sourceforge.idrs.deploy.compile.Compiler;
import net.sourceforge.idrs.deploy.compile.CompilerState;
import net.sourceforge.idrs.utils.ObjectStore;
/**
*
* @author mlb
* @version
*/
public class Repeat extends net.sourceforge.idrs.deploy.compile.units.Body {
String id, color1, color2;
/** Creates new Repeat */
public Repeat() {
}
/**
*allows for a compiler to use the attributes of the calling tag
*/
public void setAttributes(Attributes atts) throws Exception {
super.setAttributes(atts);
this.atts = atts;
id = atts.getValue("id");
color1 = atts.getValue("color1");
color2 = atts.getValue("color2");
}
/**
*allows for the compiler to work with the current state of the page compilation
*/
public void setState(CompilerState state) throws Exception {
super.setState(state);
state.addRepeatLine(id,color1,color2);
}
/**
* allows for the execution of any wrap-up code at the hitting of the end tag
*/
public void seal() throws Exception {
state.setRepeatLine();
}
}
--- NEW FILE: Rml.java ---
/*
* Rml.java
*
* Created on February 2, 2002, 8:57 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import java.util.*;
import net.sourceforge.idrs.core.report.*;
import net.sourceforge.idrs.deploy.compile.Compiler;
import net.sourceforge.idrs.deploy.compile.CompilerState;
/**
*
* @author mlb
* @version
*/
public class Rml extends net.sourceforge.idrs.deploy.compile.Compiler {
/** Creates new Rml */
public Rml() {
}
/**
* allows for the execution of any wrap-up code at the hitting of the end tag
*/
public void seal() throws Exception {
}
/**
*Handles te isHtml tag
*@param val The value of the tag
*@params atts The Attributes of the tag
*/
public void isHtml(String val, Attributes atts) throws Exception {
this.state.getReport().getBody().isHTML(Boolean.valueOf(val).booleanValue());
}
/**
*Handles te scriptClass tag
*@param val The value of the tag
*@params atts The Attributes of the tag
*/
public void scriptClass(String val, Attributes atts) throws Exception {
this.state.getReport().getHead().setScriptClass(val);
}
}
--- NEW FILE: SQL.java ---
/*
* SQL.java
*
* Created on February 6, 2002, 4:01 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import java.util.*;
import net.sourceforge.idrs.core.report.*;
import net.sourceforge.idrs.deploy.compile.Compiler;
import net.sourceforge.idrs.deploy.compile.CompilerState;
import net.sourceforge.idrs.utils.*;
/**
*
* @author mlb
* @version
*/
public class SQL extends net.sourceforge.idrs.deploy.compile.Compiler {
protected DB db;
/** Creates new SQL */
public SQL() throws Exception {
}
/**
* allows for the execution of any wrap-up code at the hitting of the end tag
*/
public void seal() {
}
/**
* allows for the compiler to work with the current state of the page compilation
*/
public void setState(CompilerState state) throws Exception {
super.setState(state);
db = ((net.sourceforge.idrs.deploy.compile.units.Db) this.state.peekNode()).getDB();
setType();
}
protected void setType() {
db.setType(DB.SQL);
}
void varType(String val, Attributes att) throws Exception {
db.addVarType(val);
}
void src(String val, Attributes atts) {
db.setSQL(val);
}
}
--- NEW FILE: StoredProc.java ---
/*
* StoredProc.java
*
* Created on February 6, 2002, 4:05 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import java.util.*;
import net.sourceforge.idrs.core.report.*;
import net.sourceforge.idrs.deploy.compile.Compiler;
import net.sourceforge.idrs.deploy.compile.CompilerState;
import net.sourceforge.idrs.utils.*;
/**
*
* @author mlb
* @version
*/
public class StoredProc extends net.sourceforge.idrs.deploy.compile.units.SQL {
/** Creates new StoredProc */
public StoredProc() throws Exception {
}
protected void setType() {
db.setType(DB.PROC);
}
}
--- NEW FILE: VarList.java ---
/*
* VarList.java
*
* Created on February 6, 2002, 2:43 PM
*/
package net.sourceforge.idrs.deploy.compile.units;
import org.xml.sax.*;
import org.xml.sax.helpers.*;
import javax.xml.parsers.*;
import java.util.*;
import net.sourceforge.idrs.core.report.*;
import net.sourceforge.idrs.deploy.compile.Compiler;
import net.sourceforge.idrs.deploy.compile.CompilerState;
/**
*
* @author mlb
* @version
*/
public class VarList extends net.sourceforge.idrs.deploy.compile.Compiler {
LinkedList list;
String id;
/** Creates new VarList */
public VarList() {
list = new LinkedList();
}
/**
* allows for the execution of any wrap-up code at the hitting of the end tag
*/
public void seal() throws Exception {
this.state.getReport().getHead().addVarList(id,new Integer(list.size()));
HashMap lists = (HashMap) this.state.getAttribute("IDRS_VAR_LISTS");
if (lists == null) {
lists = new HashMap();
this.state.setAttribute("IDRS_VAR_LISTS",lists);
}
lists.put(this.id,this.list);
}
/**
* allows for a compiler to use the attributes of the calling tag
*/
public void setAttributes(Attributes atts) throws Exception {
super.setAttributes(atts);
id = atts.getValue("id");
}
void varType(java.lang.String val, Attributes atts) throws Exception {
this.list.add(state.getClass(val));
}
}
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report
In directory usw-pr-cvs1:/tmp/cvs-serv12455/dev/src/net/sourceforge/idrs/core/report
Modified Files:
Chunk.class EvalLongScript.class EvalScriptChunk.class
FieldChunk.class FieldChunk.java IDRSBody.class
IDRSCompiler.class IDRSHead.class IDRSHead.java IDRSRep.class
IfChangeChunk.class IfResultsChunk.class
InputResultsChunk.class Int.class Line.class ObjectChunk.class
RepeatLine.class ShortScriptChunk.class TextChunk.class
Log Message:
Added upload support! Thanks to Dane Foster and Equity Technology Group for posting their code on sourceforge!
Index: Chunk.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/Chunk.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsAnuC8O and /tmp/cvsIN3g8t differ
Index: EvalLongScript.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/EvalLongScript.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvshzg1pO and /tmp/cvsAsjyHs differ
Index: EvalScriptChunk.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/EvalScriptChunk.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsAVgw7P and /tmp/cvs0O3rXv differ
Index: FieldChunk.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/FieldChunk.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsDnRdmP and /tmp/cvsCBihAu differ
Index: FieldChunk.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/FieldChunk.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FieldChunk.java 1 Feb 2002 01:34:27 -0000 1.5
--- FieldChunk.java 27 Feb 2002 23:56:31 -0000 1.6
***************
*** 40,44 ****
@param rep The RepeatLine object that this field will be contained in
*/
! public FieldChunk(String db, String field, String format, RepeatLine rep) throws Exception {
this.dbname = db;
--- 40,44 ----
@param rep The RepeatLine object that this field will be contained in
*/
! public FieldChunk(String db, String field, String format, RepeatLine rep) throws Exception {
this.dbname = db;
Index: IDRSBody.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSBody.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvstB7UES and /tmp/cvs6MdVbB differ
Index: IDRSCompiler.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSCompiler.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvsYl9l2R and /tmp/cvsu8FJDz differ
Index: IDRSHead.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSHead.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvsR8e7tT and /tmp/cvssIAkDC differ
Index: IDRSHead.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSHead.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IDRSHead.java 6 Nov 2001 23:03:14 -0000 1.4
--- IDRSHead.java 27 Feb 2002 23:56:31 -0000 1.5
***************
*** 4,7 ****
--- 4,8 ----
import net.sourceforge.idrs.script.embedable.*;
import net.sourceforge.idrs.script.*;
+ import net.sourceforge.idrs.core.servlet.MultiPartRequest;
import java.util.*;
import java.io.*;
***************
*** 405,408 ****
--- 406,421 ----
return response;
}
+
+ /**
+ *Retrieves the MultiPartRequest if it exists
+ */
+ public MultiPartRequest getMultiPartRequest() throws Exception {
+ if (request instanceof MultiPartRequest) {
+ return (MultiPartRequest) request;
+ }
+ else {
+ return null;
+ }
+ }
/**
Index: IDRSRep.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSRep.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsniykXT and /tmp/cvsO9rPND differ
Index: IfChangeChunk.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IfChangeChunk.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsHRF1GV and /tmp/cvsYQeQ6G differ
Index: IfResultsChunk.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IfResultsChunk.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsOr26fX and /tmp/cvswzk8nK differ
Index: InputResultsChunk.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/InputResultsChunk.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsnQgwCW and /tmp/cvswGHxYI differ
Index: Int.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/Int.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvsymcveY and /tmp/cvsElAccM differ
Index: Line.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/Line.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvs6u2rsX and /tmp/cvsE5SXZM differ
Index: ObjectChunk.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/ObjectChunk.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvstYYgUY and /tmp/cvsa9ufyN differ
Index: RepeatLine.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/RepeatLine.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsDy55o0 and /tmp/cvsA6f9yQ differ
Index: ShortScriptChunk.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/ShortScriptChunk.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsNQ0HV1 and /tmp/cvsOLm1zT differ
Index: TextChunk.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/TextChunk.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsSp7S50 and /tmp/cvs4s2XXR differ
|
|
From: Marc B. <big...@us...> - 2002-02-27 23:56:35
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy
In directory usw-pr-cvs1:/tmp/cvs-serv12455/dev/src/net/sourceforge/idrs/deploy
Modified Files:
DocReset.class DocReset.java HotDeploy.class
InsertToIDRS.class RMLDeploy.class
Log Message:
Added upload support! Thanks to Dane Foster and Equity Technology Group for posting their code on sourceforge!
Index: DocReset.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/DocReset.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvswiGTj6 and /tmp/cvsymzDo2 differ
Index: DocReset.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/DocReset.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DocReset.java 25 Dec 2001 06:44:00 -0000 1.1
--- DocReset.java 27 Feb 2002 23:56:31 -0000 1.2
***************
*** 136,145 ****
rs.getString(docconns));
repstr = new ReportStore(pool, info);
! names.remove(name);
names.put(name, repstr);
}
synchronized (ids) {
! ids.remove(id);
ids.put(id, repstr);
}
--- 136,146 ----
rs.getString(docconns));
repstr = new ReportStore(pool, info);
!
! if (names.get(name) != null) names.remove(name);
names.put(name, repstr);
}
synchronized (ids) {
! if (ids.get(id) != null) ids.remove(id);
ids.put(id, repstr);
}
Index: HotDeploy.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/HotDeploy.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs1wZlq9 and /tmp/cvs0XscB8 differ
Index: InsertToIDRS.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/InsertToIDRS.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsXJDo3a and /tmp/cvsYAGQRb differ
Index: RMLDeploy.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/RMLDeploy.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvs4biJka and /tmp/cvsW6yoLc differ
|
|
From: Marc B. <big...@us...> - 2002-02-27 23:56:35
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet
In directory usw-pr-cvs1:/tmp/cvs-serv12455/dev/src/net/sourceforge/idrs/core/servlet
Modified Files:
DocInfo.class IDRSSecurity.class IDRSServlet.class
IDRSServlet.java Init.class ReportStore.class
Added Files:
DataSource.java MultiPartRequest.java
Log Message:
Added upload support! Thanks to Dane Foster and Equity Technology Group for posting their code on sourceforge!
--- NEW FILE: DataSource.java ---
/********************************************************************************/
/**
<OWNER>Dane Foster</OWNER>
<ORGANIZATION>Equity Technology Group, Inc.</ORGANIZATION>
<YEAR>2001</YEAR>
Copyright (c) 2001, Equity Technology Group, Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of conditions and the following
disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of
ETG or Dane Foster nor the names of its contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**/
/**
* Description: Represents a MIME encoded object
* @author Dane Foster <mailto:df...@eq...>
* @version 1.01
* @date 12.05.01
*/
package net.sourceforge.idrs.core.servlet;
public class DataSource
{
private String contentType, filename;
private byte[] binary;
/**
* Creates a new DataSource object.
*
* @param contentType The MIME type
* @param filename The objects name. This includes any path information
* @param bin The binary contents of the MIME object
*/
protected DataSource( String contentType, String filename, byte[] bin )
{
this.contentType = contentType;
this.filename = filename;
this.binary = bin;
}
/**
* Sets this object's content type. The String should be in MIME format (i.e. image/jpeg)
*
* @param type The MIME type
*/
protected void setContentType( String type )
{
this.contentType = type;
}
/**
* Sets this object's file name. This should include any path information.
* ex. /home/loser/images/you.jpg; c:\My Documents\My Pictures\you.gif
*
* @param name The file name
*/
protected void setFilename( String name )
{
this.filename = name;
}
/**
* Sets this object's binary content
*
* @param content An array of bytes
*/
protected void setBinaryContent( byte[] content )
{
this.binary = content;
}
/**
* @return The MIME type of this DataSource object
*/
public String getContentType()
{
return this.contentType;
}
/**
* @return The full file name including any path information
*/
public String getFilename()
{
return this.filename;
}
/**
* @return The object's name minus the path information or <code>null</code> if <code>getFilename()</code>
* returns <code>null</code>
*/
public String getName()
{
String name = this.filename;
if( null != name )
{
char separator = '/';
int indx = name.indexOf( separator ); // try unix first
if( -1 == indx )
{
separator = '\\'; // try Windows next
indx = name.indexOf( separator );
}
if( -1 != indx )
name = name.substring( name.lastIndexOf( separator ) + 1 );
}
return name;
}
/**
* @return The binary content of <code>this</code> MIME object
*/
public byte[] getBinaryContent()
{
return this.binary;
}
}
--- NEW FILE: MultiPartRequest.java ---
/*
* MultiPartRequest.java
*
* Created on February 27, 2002, 3:23 PM
*/
package net.sourceforge.idrs.core.servlet;
import javax.servlet.ServletInputStream;
import javax.servlet.ServletRequest;
import javax.servlet.http.*;
import java.io.ByteArrayOutputStream;
import java.io.*;
import java.util.HashMap;
import java.util.Map;
import java.util.StringTokenizer;
import java.util.*;
import java.security.*;
/********************************************************************************/
/**
<OWNER>Dane Foster</OWNER>
<ORGANIZATION>Equity Technology Group, Inc.</ORGANIZATION>
<YEAR>2001</YEAR>
Copyright (c) 2001, Equity Technology Group, Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of conditions and the following
disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of
ETG or Dane Foster nor the names of its contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**/
/**
* Parses the ServletInputStream of encoding multipart/form-data and separates it into name value pairs.
* The name-value pairs are stored in the <code>map</code> argument. There are a couple of things to be aware of.
* This class is not a replacement for the <code>javax.servlet.ServletRequest</code> interface but augments it. It
* should only be used in cases where the client is POSTing multipart/form-data encoded data. This class will NOT
* work under any other conditions.
*
* <p>
* This class breaks the data into 4 groups of objects:<br>
* 1 - Strings<br>
* 2 - Arrays of Strings (String[])<br>
* 3 - DataSource objects<br>
* 4 - Arrays of DataSource objects (DataSource[])</p>
*
* <p>
* A String object is returned for text fields, text-areas, etc.<br>
* A String[] is returned for lists and check-boxes and etc.<br>
* A DataSource object is returned for binary data specified by <input type="file"><br>
* A DataSource[] is returned for file fields which allow multiple selections.<br>
* Just a note: I haven't found a browser yet that allows the multiple selection of filez but RFC 2388 and the W3C
* HTML 4.01 describes the format for this type of functionality so I've put it here.
*
* Usage senarios:<p>
* Naturally I'm assuming you (you the programmer that's using this class) already know the layout of the HTML
* form(s) that your serlvet(s) may be processing, therefore it's your responsiblity to avoid
* <code>NullPointerException</code>s that may be caused by trying to access a field that does not exist in the HTML
* form. Additionally, watch out for <code>ClassCastException</code>s that may be caused if you misjudge the type
* of data that form field contains.</p>
*
* <pre>
* // Get access to an image that the client uploaded to the servlet.
* DataSource uploadedFile = (DataSource)map.get( "fieldname" );
* byte[] binaryData = uploadedFile.getBinaryContent();
* String contentType = uploadedFile.getContentType();
* String fullFilename = uploadedFile.getFilename();// includes path info (i.e. /home/loser/images/smile.jpg)
* String filename = uploadedFile.getName();// excludes path info (i.e. smile.jpg)
* </pre>
*
* <pre>
* // Access list data (i.e. checkboxes, multiple selection lists)
* String[] typesOfMusic = (String[])map.get( "musicCheckBoxes" );
* </pre>
*
* This is equivalent to the <code>javax.servlet.ServletRequest</code>'s
* <code>public String[] getParameterValues( java.lang.String )</code> method.
*
* @param request A <code>ServletRequest</code> object.
* @param map The <code>Map</code> will be populated with the name value pairs of the HTML/XHTML form's
* content.
*/
public final class MultiPartRequest implements javax.servlet.http.HttpServletRequest {
private final static short UNDEF = -1;
private final static short READY = 0;
private final static short FILENAME = 1;
private final static short NAME = 2;
private final static short BINARY = 3;
private final static short TXTDATA = 4;
private final static short CONTENT_TYPE = 5;
private final static String CRLF = "\r\n";
private HashMap params;
private HttpServletRequest request;
/** Creates new MultiPartRequest */
public MultiPartRequest(HttpServletRequest request) throws Exception {
this.request = request;
this.params = new HashMap();
read(request,params);
}
private void read( ServletRequest request, Map map ) throws IOException
{
String filename = null;
String fieldName = null;
String contentType = null;
StringBuffer fieldValue = null;
//Get the separator for the form data.
int pos = request.getContentType().indexOf( '=' );
String boundary = "--" + request.getContentType().substring( pos + 1 ).trim();
ByteArrayOutputStream binarybuffer = new ByteArrayOutputStream();
byte[] bytes = new byte[ 1024 ];
ServletInputStream sStream = request.getInputStream();
int eof = sStream.readLine( bytes, 0, bytes.length );
short state = UNDEF;
while( -1 != eof )
{
String filter = new String( bytes, 0, eof );
String caseInsensitiveFilter = filter.toLowerCase();
if( filter.startsWith( boundary ) )
{
state = READY;
if( null != fieldName )
{
if( null != fieldValue )
{
Object o = map.get( fieldName ); // Find out if the field name already exists.
Object val = fieldValue.substring( 0, fieldValue.length() - 2 ); // Strip the CRLF
if( null != o ) // The field name already existed so assume we are dealing w/ a _list_ of values
{
if( o.getClass().isArray() )
{
int length = ((Object[])o).length;
String[] array = new String[ length + 1 ];
System.arraycopy( o, 0, array, 0, length );
array[ length ] = (String)val;
val = array;
array = null;
}
else
val = new String[]{(String)o, (String)val};
}
map.put( fieldName, val );
}
else if( binarybuffer.size() > 0 )
{
byte[] bin = binarybuffer.toByteArray();
byte[] copy = new byte[ bin.length - 2 ]; //strip CRLF
System.arraycopy( bin, 0, copy, 0, copy.length );
map.put( fieldName, new DataSource( contentType, filename, copy ) );
bin = copy = null;
}
fieldName = filename = contentType = null;
fieldValue = null;
binarybuffer.reset();
}
}
else if( caseInsensitiveFilter.startsWith( "content-disposition: form-data" ) && READY == state )
{
for( StringTokenizer tokenizer = new StringTokenizer( filter, ";=\"" ); tokenizer.hasMoreTokens(); )
{
String token = tokenizer.nextToken().trim();
if( token.startsWith( "name" ) )
{
fieldName = tokenizer.nextToken();
state = NAME;
}
else if( token.startsWith( "filename" ) )
{
state = FILENAME;
filename = tokenizer.nextToken();
}
}
}
else if( caseInsensitiveFilter.startsWith( "content-type: multipart/mixed" ) && NAME == state )
{
String subpartBoundary = "--" + filter.substring( filter.indexOf( '=' ) + 1 ).trim();
Object[] filez = handleSubpart( sStream, subpartBoundary );
map.put( fieldName, filez );
fieldName = null;
fieldValue = null;
filename = null;
contentType = null;
binarybuffer.reset();
state = UNDEF;
}
else if( caseInsensitiveFilter.startsWith( "content-type: " ) && FILENAME == state )
contentType = filter.substring( 14, filter.length() - 2 );// strip CRLF
else if( filter.equals( CRLF ) && state == FILENAME )
state = BINARY;
else if( filter.equals( CRLF ) && state == NAME )
state = TXTDATA;
else if( state == TXTDATA )
fieldValue = fieldValue == null ? new StringBuffer( filter ) : fieldValue.append( filter );
else if( state == BINARY )
binarybuffer.write( bytes, 0, eof );
eof = sStream.readLine( bytes, 0, bytes.length );
}// Parsing stops here. The Map should now contain all of the form's data.
sStream.close();
}
/**
* A state-machine similar to the read method except it only handles parsing mulipart/mixed encoded data
*
* @param inStream The ServletInputStream that it will get data from
* @param boundary The component boundary
*
* @return An array of DataSource objects containing the list of filez the user sent.
*/
private DataSource[] handleSubpart( ServletInputStream inStream, String startboundary ) throws IOException
{
String contentType = null;
String filename = null;
DataSource[] filez = null;
String endboundary = startboundary + "--";
byte[] binbucket = new byte[ 1024 ];
ByteArrayOutputStream binbuffer = new ByteArrayOutputStream();
short state = UNDEF;
int eof = inStream.readLine( binbucket, 0, binbucket.length );
while( -1 != eof )
{
String filter = new String( binbucket, 0, eof );
String lowercaseFilter = filter.toLowerCase();
if( filter.startsWith( startboundary ) )
{
state = READY;
if( binbuffer.size() > 0 )
{
byte[] bin = binbuffer.toByteArray();
byte[] bincopy = new byte[ bin.length - 2 ];// strip CRLF
System.arraycopy( bin, 0, bincopy, 0, bincopy.length );
if( null == filez )
filez = new DataSource[]{new DataSource( contentType, filename, bincopy )};
else
{
DataSource[] copy = new DataSource[ filez.length + 1 ];
System.arraycopy( filez, 0, copy, 0, filez.length );
copy[ filez.length ] = new DataSource( contentType, filename, bincopy );
filez = copy;
copy = null;
}
bin = bincopy = null;
binbuffer.reset();
}
if( filter.trim().equals( endboundary ) )
break;
}
else if( lowercaseFilter.startsWith( "content-disposition: " ) && READY == state )
{
int indx = filter.indexOf( "filename=" );
filename = filter.substring( indx + 10, filter.length() - 3 );// strip CRLF && the closing "
state = FILENAME;
}
else if( lowercaseFilter.startsWith( "content-type: " ) && FILENAME == state )
{
contentType = filter.substring( 14, filter.length() - 2 );
state = CONTENT_TYPE;
}
else if( filter.equals( CRLF ) && CONTENT_TYPE == state )
state = BINARY;
else if( BINARY == state )
binbuffer.write( binbucket, 0, eof );
eof = inStream.readLine( binbucket, 0, binbucket.length );
}
return filez;
}
public java.lang.Object getAttribute(java.lang.String str) {
return request.getAttribute(str);
}
public java.util.Enumeration getAttributeNames() {
return request.getAttributeNames();
}
public java.lang.String getCharacterEncoding() {
return this.request.getCharacterEncoding();
}
public int getContentLength() {
return request.getContentLength();
}
public java.lang.String getContentType() {
return request.getContentType();
}
public javax.servlet.ServletInputStream getInputStream() throws java.io.IOException {
return request.getInputStream();
}
public java.util.Locale getLocale() {
return this.request.getLocale();
}
public java.util.Enumeration getLocales() {
return this.request.getLocales();
}
public java.lang.String getParameter(java.lang.String str) {
Object val = params.get(str);
String sval;
if (val instanceof String[]) {
sval = ((String[])val)[0];
}
else if (val instanceof String) {
sval = (String) val;
}
else if (val instanceof DataSource[]) {
sval = ((DataSource[]) val)[0].getFilename();
}
else {
sval = ((DataSource) val).getFilename();
}
return sval;
}
public java.util.Enumeration getParameterNames() {
return new IteratorEnumeration(this.params.keySet().iterator());
}
public java.lang.String[] getParameterValues(java.lang.String str) {
Object val = params.get(str);
if (val instanceof String[]) {
return (String[])val;
}
else if (val instanceof String) {
String s = (String) val;
String ss[] = {(String) val};
return ss;
}
else {
return null;
}
}
public java.lang.String getProtocol() {
return request.getProtocol();
}
public java.io.BufferedReader getReader() throws java.io.IOException {
return request.getReader();
}
public java.lang.String getRealPath(java.lang.String str) {
return request.getRealPath(str);
}
public java.lang.String getRemoteAddr() {
return request.getRemoteAddr();
}
public java.lang.String getRemoteHost() {
return request.getRemoteHost();
}
public javax.servlet.RequestDispatcher getRequestDispatcher(java.lang.String str) {
return this.request.getRequestDispatcher(str);
}
public java.lang.String getScheme() {
return request.getScheme();
}
public java.lang.String getServerName() {
return request.getServerName();
}
public int getServerPort() {
return request.getServerPort();
}
public boolean isSecure() {
return request.isRequestedSessionIdFromCookie();
}
public void removeAttribute(java.lang.String str) {
request.removeAttribute(str);
}
public void setAttribute(java.lang.String str, java.lang.Object obj) {
request.setAttribute(str,obj);
}
public java.lang.String getAuthType() {
return request.getAuthType();
}
public java.lang.String getContextPath() {
return request.getContextPath();
}
public javax.servlet.http.Cookie[] getCookies() {
return request.getCookies();
}
public long getDateHeader(java.lang.String str) {
return request.getDateHeader(str);
}
public java.lang.String getHeader(java.lang.String str) {
return request.getHeader(str);
}
public java.util.Enumeration getHeaderNames() {
return request.getHeaderNames();
}
public java.util.Enumeration getHeaders(java.lang.String str) {
return request.getHeaders(str);
}
public int getIntHeader(java.lang.String str) {
return request.getIntHeader(str);
}
public java.lang.String getMethod() {
return request.getMethod();
}
public java.lang.String getPathInfo() {
return request.getPathInfo();
}
public java.lang.String getPathTranslated() {
return request.getPathTranslated();
}
public java.lang.String getQueryString() {
return request.getQueryString();
}
public java.lang.String getRemoteUser() {
return request.getRemoteUser();
}
public java.lang.String getRequestURI() {
return request.getRequestURI();
}
public java.lang.String getRequestedSessionId() {
return request.getRequestedSessionId();
}
public java.lang.String getServletPath() {
return request.getServletPath();
}
public javax.servlet.http.HttpSession getSession() {
return request.getSession();
}
public javax.servlet.http.HttpSession getSession(boolean param) {
return request.getSession(param);
}
public java.security.Principal getUserPrincipal() {
return request.getUserPrincipal();
}
public boolean isRequestedSessionIdFromCookie() {
return request.isRequestedSessionIdFromCookie();
}
public boolean isRequestedSessionIdFromURL() {
return request.isRequestedSessionIdFromURL();
}
public boolean isRequestedSessionIdFromUrl() {
return request.isRequestedSessionIdFromUrl();
}
public boolean isRequestedSessionIdValid() {
return request.isRequestedSessionIdValid();
}
public boolean isUserInRole(java.lang.String str) {
return request.isUserInRole(str);
}
public void saveFile(String key,String path) throws Exception {
DataSource ds;
if (params.get(key) instanceof DataSource[]) {
ds = ((DataSource[]) params.get(key))[0];
}
else if (params.get(key) instanceof DataSource) {
ds = ((DataSource) params.get(key));
}
else {
throw new IllegalArgumentException(key + " is not a file");
}
BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(new File(path)));
out.write(ds.getBinaryContent()) ;
out.close();
}
public int numFiles(String key) throws Exception {
Object val = params.get(key);
DataSource[] ds;
if (val instanceof DataSource[]) {
ds = (DataSource[]) val;
return ds.length;
}
else {
throw new IllegalArgumentException(key + " is not a list of files");
}
}
public void saveFile(String key,int i,String path) throws Exception {
DataSource ds;
if (params.get(key) instanceof DataSource[]) {
ds = ((DataSource[]) params.get(key))[i];
}
else if (params.get(key) instanceof DataSource) {
throw new IllegalArgumentException(key + " is not a list of files");
}
else {
throw new IllegalArgumentException(key + " is not a file");
}
BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(new File(path)));
out.write(ds.getBinaryContent());
out.close();
}
public void setCharacterEncoding(String val) throws java.io.UnsupportedEncodingException {
request.setCharacterEncoding(val);
}
public Map getParameterMap() {
return params;
}
public StringBuffer getRequestURL() {
return request.getRequestURL();
}
}
Index: DocInfo.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/DocInfo.class,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsy4dMeZ and /tmp/cvseaDulO differ
Index: IDRSSecurity.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/IDRSSecurity.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvsuZSLp0 and /tmp/cvseg92HQ differ
Index: IDRSServlet.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/IDRSServlet.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvsaW0lV1 and /tmp/cvs4wtJxT differ
Index: IDRSServlet.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/IDRSServlet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** IDRSServlet.java 23 Jan 2002 21:33:52 -0000 1.8
--- IDRSServlet.java 27 Feb 2002 23:56:31 -0000 1.9
***************
*** 50,53 ****
--- 50,55 ----
public IDRSServlet() {
}
+
+
/*
***************
*** 150,156 ****
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws ServletException {
! preProc(req, resp);
}
--- 152,192 ----
}
+ /**
+ *Determines if request is simple, or needs to be parsed
+ *Taken from Jakarta Turbine
+ */
+ private boolean isSimpleForm(HttpServletRequest req)
+ {
+ String header = req.getHeader("Content-Type");
+ if( header != null && header.indexOf("multipart/form-data") >= 0)
+ return false;
+ return true;
+ }
+
+
+
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws ServletException {
! HttpServletRequest request=null;
!
! if (isSimpleForm(req)) {
! request = req;
! }
! else {
! try {
! request = new MultiPartRequest(req);
! }
! catch (Exception e) {
! try {
! System.out.println("Error in parsing multi/part request");
! e.printStackTrace(System.out);
! }
! catch (Exception ee) {}
! }
! }
!
! if (request == null) request = req;
!
! preProc(request, resp);
}
***************
*** 162,166 ****
@param sysCon The System Connection used by the system
*/
!
/*
ERRORS: Conn doesn't exist, System maxed out
--- 198,202 ----
@param sysCon The System Connection used by the system
*/
!
/*
ERRORS: Conn doesn't exist, System maxed out
***************
*** 417,420 ****
--- 453,458 ----
docName = rap.getParameter("doc_Name");
}
+
+
//initialize some information about the report
Index: Init.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/Init.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsFrZv93 and /tmp/cvsEeB06X differ
Index: ReportStore.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/servlet/ReportStore.class,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvscK4Xw5 and /tmp/cvsO4Z0W0 differ
|
|
From: Marc B. <big...@us...> - 2002-02-27 23:56:35
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core In directory usw-pr-cvs1:/tmp/cvs-serv12455/dev/src/net/sourceforge/idrs/core Modified Files: IDRSPool.class ScriptPool.class Log Message: Added upload support! Thanks to Dane Foster and Equity Technology Group for posting their code on sourceforge! Index: IDRSPool.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/IDRSPool.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsUZ3O4D and /tmp/cvsKMK617 differ Index: ScriptPool.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/ScriptPool.class,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsyLePHF and /tmp/cvse2BV8a differ |
|
From: Marc B. <big...@us...> - 2002-02-27 23:56:34
|
Update of /cvsroot/idrs/Idrs/dev/lib In directory usw-pr-cvs1:/tmp/cvs-serv12455/dev/lib Modified Files: idrs.jar Log Message: Added upload support! Thanks to Dane Foster and Equity Technology Group for posting their code on sourceforge! Index: idrs.jar =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/lib/idrs.jar,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvszBB0Dz and /tmp/cvsmVWupY differ |
|
From: Marc B. <big...@us...> - 2002-02-27 23:56:34
|
Update of /cvsroot/idrs/Idrs/dev/classes/net/sourceforge/idrs/script/embedable In directory usw-pr-cvs1:/tmp/cvs-serv12455/dev/classes/net/sourceforge/idrs/script/embedable Modified Files: IDRSShell.class Log Message: Added upload support! Thanks to Dane Foster and Equity Technology Group for posting their code on sourceforge! Index: IDRSShell.class =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/classes/net/sourceforge/idrs/script/embedable/IDRSShell.class,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs4cScas and /tmp/cvsYrmn3J differ |
