Project

General

Profile

« Previous | Next » 

Revision 2726

Added by harris about 19 years ago

Removed all hard links, and put the jsp page in the same context as the geoserver.

View differences:

src/spatial/metacat_spatialresolver.jsp
38 38
    String _request = request.getParameter("REQUEST");
39 39
    _request = (_request!=null)? _request.trim() : "";
40 40
  
41
  	System.out.println("request param: >>" + _request);
41 42
  	System.out.println("uri: >>" + request.getRequestURI());
42 43
	  System.out.println("request string: >>" + request.getQueryString()+" \n");
43 44
					   
......
71 72
        in.close();
72 73
	} else {
73 74
    System.out.println(" -- not a metacat query");
74
    String _url = "http://sulphur.homelinux.com:9999/geoserver/wms?"+ request.getQueryString();
75
    String _url = "/geoserver/wms?"+ request.getQueryString();
75 76
    
76 77
    System.out.println("redirecting to: " + _url);
77 78
    response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
src/spatial/rendering/mapbuilder/available_layers.html
9 9
<link rel="stylesheet" href="../../../../style.css" type="text/css">
10 10
<link rel="stylesheet" href="../../lib/skin/default/html.css" type="text/css">
11 11

  
12
<link href="http://metacat.nceas.ucsb.edu/knb/style/skins/knb/knb.css" type="text/css" rel="stylesheet">
13
<script src="http://metacat.nceas.ucsb.edu/knb/style/skins/knb/knb.js" type="text/JavaScript" language="Javascript"></script>
14
<script src="http://metacat.nceas.ucsb.edu/knb/style/common/branding.js" type="text/JavaScript" language="Javascript"></script><script language="JavaScript">
12
<link href="./knb/style/skins/knb/knb.css" type="text/css" rel="stylesheet">
13
<script src="./knb/style/skins/knb/knb.js" type="text/JavaScript" language="Javascript"></script>
14
<script src="./knb/style/common/branding.js" type="text/JavaScript" language="Javascript"></script><script language="JavaScript">
15 15
          function submitform(action,form_ref) {
16 16
            form_ref.action.value=action;
17 17
            form_ref.sessionid.value="";
src/spatial/rendering/mapbuilder/available_layers_config.xml
46 46
    </Context>
47 47
    
48 48
    <Context id="locator">
49
      <defaultModelUrl>metacat.xml</defaultModelUrl>
49
      <defaultModelUrl>available_layers_model.xml</defaultModelUrl>
50 50
      <widgets>
51 51
        <MapPane id="locatorWidget">
52 52
          <htmlTagId>locatorMap</htmlTagId>
src/spatial/rendering/mapbuilder/lib/tool/GetFeatureInfo.xsl
57 57
          <xsl:otherwise>?</xsl:otherwise>
58 58
        </xsl:choose>
59 59
      </xsl:variable>
60

  
61
     http://sulphur.homelinux.com:7000/cgs/metacat_spatialresolver.jsp<xsl:value-of select="$firstJoin"/>VERSION=<xsl:value-of select="$version"/>&amp;REQUEST=GetFeatureInfo&amp;SRS=<xsl:value-of select="$srs"/>&amp;BBOX=<xsl:value-of select="$bbox"/>&amp;WIDTH=<xsl:value-of select="$width"/>&amp;HEIGHT=<xsl:value-of select="$height"/>&amp;LAYERS=<xsl:value-of select="$queryLayer"/>&amp;FORMAT=<xsl:value-of select="$infoFormat"/>&amp;FEATURE_COUNT=<xsl:value-of select="$featureCount"/>&amp;QUERY_LAYERS=<xsl:value-of select="$queryLayer"/>&amp;X=<xsl:value-of select="$xCoord"/>&amp;Y=<xsl:value-of select="$yCoord"/>
60
/geoserver/metacat_spatialresolver.jsp<xsl:value-of select="$firstJoin"/>VERSION=<xsl:value-of select="$version"/>&amp;REQUEST=GetFeatureInfo&amp;SRS=<xsl:value-of select="$srs"/>&amp;BBOX=<xsl:value-of select="$bbox"/>&amp;WIDTH=<xsl:value-of select="$width"/>&amp;HEIGHT=<xsl:value-of select="$height"/>&amp;LAYERS=<xsl:value-of select="$queryLayer"/>&amp;FORMAT=<xsl:value-of select="$infoFormat"/>&amp;FEATURE_COUNT=<xsl:value-of select="$featureCount"/>&amp;QUERY_LAYERS=<xsl:value-of select="$queryLayer"/>&amp;X=<xsl:value-of select="$xCoord"/>&amp;Y=<xsl:value-of select="$yCoord"/>
62 61
      <!-- Print the URL -->
63 62
      <!--<xsl:value-of select="$baseUrl"/><xsl:value-of select="$firstJoin"/>VERSION=<xsl:value-of select="$version"/>&amp;REQUEST=GetFeatureInfo&amp;SRS=<xsl:value-of select="$srs"/>&amp;BBOX=<xsl:value-of select="$bbox"/>&amp;WIDTH=<xsl:value-of select="$width"/>&amp;HEIGHT=<xsl:value-of select="$height"/>&amp;LAYERS=<xsl:value-of select="$queryLayer"/>&amp;FORMAT=<xsl:value-of select="$infoFormat"/>&amp;FEATURE_COUNT=<xsl:value-of select="$featureCount"/>&amp;QUERY_LAYERS=<xsl:value-of select="$queryLayer"/>&amp;X=<xsl:value-of select="$xCoord"/>&amp;Y=<xsl:value-of select="$yCoord"/>
64 63
   --> </xsl:if>
src/spatial/rendering/mapbuilder/index.html
9 9
<link rel="stylesheet" href="../../../../style.css" type="text/css">
10 10
<link rel="stylesheet" href="../../lib/skin/default/html.css" type="text/css">
11 11

  
12
<link href="http://metacat.nceas.ucsb.edu/knb/style/skins/knb/knb.css" type="text/css" rel="stylesheet">
13
<script src="http://metacat.nceas.ucsb.edu/knb/style/skins/knb/knb.js" type="text/JavaScript" language="Javascript"></script>
14
<script src="http://metacat.nceas.ucsb.edu/knb/style/common/branding.js" type="text/JavaScript" language="Javascript"></script><script language="JavaScript">
12
<link href="./knb/style/skins/knb/knb.css" type="text/css" rel="stylesheet">
13
<script src="./knb/style/skins/knb/knb.js" type="text/JavaScript" language="Javascript"></script>
14
<script src="./knb/style/common/branding.js" type="text/JavaScript" language="Javascript"></script><script language="JavaScript">
15 15
          function submitform(action,form_ref) {
16 16
            form_ref.action.value=action;
17 17
            form_ref.sessionid.value="";
src/spatial/rendering/mapbuilder/available_layers_model.xml
66 66
    <Layer queryable="1" hidden="0">
67 67
      <Server service="OGC:WMS" version="1.1.1"
68 68
      title="esri places">
69
        <OnlineResource xlink:type="simple" xlink:href="http://sulphur.homelinux.com:9999/geoserver/wms" />
69
        <OnlineResource xlink:type="simple" xlink:href="../../../../wms" />
70 70
      </Server>
71 71
      <Name>topp:RIVERS</Name>
72 72
      <Title>esri world rivers</Title>
......
79 79
    <Layer queryable="1" hidden="0">
80 80
      <Server service="OGC:WMS" version="1.1.1"
81 81
      title="esri places">
82
        <OnlineResource xlink:type="simple" xlink:href="http://sulphur.homelinux.com:9999/geoserver/wms" />
82
        <OnlineResource xlink:type="simple" xlink:href="../../../../wms" />
83 83
      </Server>
84 84
      <Name>topp:country</Name>
85 85
      <Title>esri world countries</Title>
......
92 92
    <Layer queryable="1" hidden="0">
93 93
      <Server service="OGC:WMS" version="1.1.1"
94 94
      title="esri places">
95
        <OnlineResource xlink:type="simple" xlink:href="http://sulphur.homelinux.com:9999/geoserver/wms" />
95
        <OnlineResource xlink:type="simple" xlink:href="../../../../wms" />
96 96
      </Server>
97 97
      <Name>topp:places</Name>
98 98
      <Title>esri usa places</Title>
......
105 105
    <Layer queryable="1" hidden="0">
106 106
      <Server service="OGC:WMS" version="1.1.1"
107 107
      title="esri places">
108
        <OnlineResource xlink:type="simple" xlink:href="http://sulphur.homelinux.com:9999/geoserver/wms" />
108
        <OnlineResource xlink:type="simple" xlink:href="../../../../wms" />
109 109
      </Server>
110 110
      <Name>topp:CITIES</Name>
111 111
      <Title>esri world cities places</Title>
......
118 118
    <Layer queryable="1" hidden="0">
119 119
      <Server service="OGC:WMS" version="1.1.1"
120 120
      title="esri places">
121
        <OnlineResource xlink:type="simple" xlink:href="http://sulphur.homelinux.com:9999/geoserver/wms" />
121
        <OnlineResource xlink:type="simple" xlink:href="../../../../wms" />
122 122
      </Server>
123 123
      <Name>topp:latlong</Name>
124 124
      <Title>esri world latlong</Title>

Also available in: Unified diff