diff --git a/admin/php/xml.php b/admin/php/xml.php index 37c3155..fbf2dda 100644 --- a/admin/php/xml.php +++ b/admin/php/xml.php @@ -316,8 +316,12 @@ RSS function geraXmlWMSmetaestat($locaplic) { global $esquemaadmin; - $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); - $url = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST']."/".(basename(str_replace("/admin/php/xml.php","",__FILE__))); + $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); + $c = "/admin/php/xml.php"; + if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')){ + $c = "\admin\php\xml.php"; + } + $url = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST']."/".(basename(str_replace($c,"",__FILE__))); $sql = "select DISTINCT b.id_medida_variavel as id_ws, 'WMSMETAESTAT' as tipo_ws,'".$url."/ogc.php?id_medida_variavel='||b.id_medida_variavel as link_ws,a.nome||' -> '||b.nomemedida as nome_ws,a.descricao as desc_ws, '' as autor_ws from i3geoestat_variavel as a ,i3geoestat_medida_variavel as b WHERE a.codigo_variavel = b.codigo_variavel ORDER BY a.nome"; return geraXmlRSS($locaplic,$sql,"Web services WMS-TIME OGC"); } @@ -623,7 +627,11 @@ function geraXmlMapas($perfil,$locaplic,$editores) $q = $dbh->query($q); $editor = "nao";//$editor = "nao";//verificaEditores($editores); $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); - $url = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST']."/".(basename(str_replace("/admin/php/xml.php","",__FILE__))); + $c = "/admin/php/xml.php"; + if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')){ + $c = "\admin\php\xml.php"; + } + $url = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST']."/".(basename(str_replace($c,"",__FILE__))); foreach($q as $row) { $mostraMapa = false; @@ -680,7 +688,11 @@ function geraRSSmapas($locaplic) { global $esquemaadmin; $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); - $url = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST']."/".(basename(str_replace("/admin/php/xml.php","",__FILE__))); + $c = "/admin/php/xml.php"; + if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')){ + $c = "\admin\php\xml.php"; + } + $url = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST']."/".(basename(str_replace($c,"",__FILE__))); $descricao = "'"; $descricao .= "Openlayers 1

"; $descricao .= "Openlayers 2

"; diff --git a/ms_configura.php b/ms_configura.php index 3312ed8..1d9a72a 100644 --- a/ms_configura.php +++ b/ms_configura.php @@ -416,7 +416,7 @@ Tipo: {array ou string} */ $postgis_mapa = array( - "teste"=>"user=postgres password=postgres dbname=postgis host=localhost port=5432 options='-c client_encoding=LATIN1'", + "teste"=>"user=postgres password=postgres dbname=sissgeo host=localhost port=5432 options='-c client_encoding=LATIN1'", "postgres"=>"user=postgres password=postgres dbname=postgres host=localhost port=5432", "i3geosaude"=>"user=postgres password=postgres dbname=i3geosaude host=localhost port=5432 options='-c client_encoding=LATIN1'" ); diff --git a/temas/teste.map b/temas/teste.map index 93002ff..9da6bde 100644 --- a/temas/teste.map +++ b/temas/teste.map @@ -1,21 +1,33 @@ -MAP -SYMBOLSET ../symbols/simbolosv6.sym -FONTSET "../symbols/fontes.txt" -LAYER - NAME "teste" - TEMPLATE "none.htm" - TYPE line - DATA "" - METADATA - TEMA "Teste de localidades" - CLASSE "SIM" - END - CLASS - NAME "" - STYLE - COLOR 0 0 0 - SIZE 12 - END - END -END -END +MAP + FONTSET "../symbols/fontes.txt" + SYMBOLSET "../symbols/simbolosv6.sym" + LAYER + CONNECTION "user=postgres password=postgres dbname=sissgeo host=localhost port=5432 options='-c client_encoding=LATIN7'" + CONNECTIONTYPE POSTGIS + DATA "geom from (select geom,cod_bioma,ds_sintese,ds_bioma,nom_bioma,gid from fisico.biomas) as foo using unique gid using srid=4326" + METADATA + "METAESTAT_ID_MEDIDA_VARIAVEL" "" + "cache" "" + "CLASSE" "SIM" + "METAESTAT_CODIGO_TIPO_REGIAO" "" + "metaestat" "" + "TEMA" "Teste de localidades" + "convcaracter" "" + "cortepixels" "0" + END # METADATA + NAME "teste" + STATUS OFF + TEMPLATE "none.htm" + TYPE POLYGON + UNITS METERS + CLASS + NAME "" + STYLE + COLOR 0 0 0 + SIZE 12 + END # STYLE + END # CLASS + END # LAYER + +END # MAP + -- libgit2 0.21.2