Project

General

Profile

« Previous | Next » 

Revision 3780

Added by daigle about 16 years ago

Changes to remove ANT tokens for the turnkey install project

View differences:

DBTransform.java
86 86
  private String 	configDir = null;
87 87
  private String	defaultStyle = null;
88 88
  private Logger logMetacat = Logger.getLogger(DBTransform.class);
89
  private String httpServer = null;
89 90
  private String contextURL = null;
91
  private String servletURL = null;
90 92
  
91 93
  /**
92 94
   * construct a DBTransform instance.
......
104 106
    util = new MetaCatUtil();
105 107
    configDir = util.getOption("config-dir");
106 108
    defaultStyle = util.getOption("default-style");
107
    contextURL = util.getOption("httpserver")+"/"+util.getOption("context")+"/";
109
    httpServer = util.getOption("httpserver");
110
    contextURL = util.getOption("httpserver")+"/"+util.getOption("context");
111
    servletURL = util.getOption("httpserver")+util.getOption("servletpath");
108 112
  }
109 113

  
110 114
  /**
......
161 165
      }
162 166
      catch (Exception e)
163 167
      {
164
        pw.println(xslSystemId + "Error transforming document in " +
168
        pw.println(xslSystemId + ": Error transforming document in " +
165 169
                   "DBTransform.transformXMLDocument: " +
166 170
                   e.getMessage());
167 171

  
......
203 207
      }
204 208
      catch (Exception e)
205 209
      {
206
        logMetacat.error(xslSystemId + "Error transforming document in " +
210
        logMetacat.error(xslSystemId + ": Error transforming document in " +
207 211
                   "DBTransform.transformXMLDocument: " +
208 212
                   e.getMessage());
209 213

  
......
243 247
      }
244 248
      catch (Exception e)
245 249
      {
246
        pw.println(xslSystemId + "Error transforming document in " +
250
        pw.println(xslSystemId + ": Error transforming document in " +
247 251
                   "DBTransform.transformXMLDocument: " +
248 252
                   e.getMessage());
249 253

  
......
306 310
        //set up the default params (can be overridden by the passed in params)
307 311
        String cgiPrefix = MetaCatUtil.getOption("cgi-prefix");
308 312
        logMetacat.debug("cgi-prefix=" + cgiPrefix);
313
        logMetacat.debug("httpServer=" + httpServer);
309 314
        logMetacat.debug("contextURL=" + contextURL);
315
        logMetacat.debug("serletPath=" + servletURL);
310 316
        transformer.setParameter("cgi-prefix", cgiPrefix);
317
        transformer.setParameter("httpServer", httpServer);
311 318
        transformer.setParameter("contextURL", contextURL);
319
        transformer.setParameter("servletURL", servletURL);
312 320
        
313 321
        // Set up parameter for transformation
314 322
        if ( param != null) {

Also available in: Unified diff