[prev in list] [next in list] [prev in thread] [next in thread]
List: mapguide-commits
Subject: [mapguide-commits] r8613 - in branches/2.6/MgDev: . Server/src/Core Web/src/JavaApi Web/src/JavaApiE
From: svn_mapguide () osgeo ! org
Date: 2015-04-02 11:36:01
Message-ID: 20150402113601.09426390405 () trac ! osgeo ! org
[Download RAW message or body]
Author: jng
Date: 2015-04-02 04:36:00 -0700 (Thu, 02 Apr 2015)
New Revision: 8613
Modified:
branches/2.6/MgDev/
branches/2.6/MgDev/Server/src/Core/Makefile.am
branches/2.6/MgDev/Web/src/JavaApi/Makefile.am
branches/2.6/MgDev/Web/src/JavaApiEx/Makefile.am
branches/2.6/MgDev/Web/src/PhpApi/Makefile.am
branches/2.6/MgDev/Web/src/schemareport/displayschema.php
Log:
Merged revision(s) 8423, 8433, 8439 from trunk/MgDev:
#309: Ensure /var/lock/mgserver is created in mgserver.sh and mgserverd.sh
........
#2495: Disable VTA flag when compiling Java and PHP wrappers
........
#2499: Schema report: ShowFirstClass doesn't work. On behalf of Andy Zhang.
http://trac.osgeo.org/mapguide/ticket/2499
The JS function ShowFirstClass in displayschema.php doesn't work. It is because the \
element name is "Data_"+schemaName+"_"+className. But ShowFirstClass uses \
"Data_"+className to get the element.
........
Property changes on: branches/2.6/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/sandbox/jng/createruntimemap:7486-7555
/sandbox/rfc94:5099-5163
/trunk/MgDev:8209-8210,8230,8313,8333,8359,8388,8392,8443
+ /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/sandbox/jng/createruntimemap:7486-7555
/sandbox/rfc94:5099-5163
/trunk/MgDev:8209-8210,8230,8313,8333,8359,8388,8392,8423,8433,8439,8443
Modified: branches/2.6/MgDev/Server/src/Core/Makefile.am
===================================================================
--- branches/2.6/MgDev/Server/src/Core/Makefile.am 2015-04-01 15:50:42 UTC (rev 8612)
+++ branches/2.6/MgDev/Server/src/Core/Makefile.am 2015-04-02 11:36:00 UTC (rev 8613)
@@ -435,6 +435,7 @@
@echo 'export MENTOR_DICTIONARY_PATH=$(mentor_dict_install_dir)' >> \
${prefix}/bin/mgserver.sh @echo 'export \
LD_LIBRARY_PATH=$(fdodir):"$$LD_LIBRARY_PATH"' >> ${prefix}/bin/mgserver.sh @echo \
'export NLSPATH=$(map_fdo_nls):"$$NLSPATH"' >> ${prefix}/bin/mgserver.sh + @echo \
'mkdir -p /var/lock/mgserver' >> ${prefix}/bin/mgserver.sh @echo 'pushd \
${prefix}/bin' >> ${prefix}/bin/mgserver.sh @cp -f ${prefix}/bin/mgserver.sh \
${prefix}/bin/mgserverd.sh @echo './mgserver run' >> ${prefix}/bin/mgserver.sh
Modified: branches/2.6/MgDev/Web/src/JavaApi/Makefile.am
===================================================================
--- branches/2.6/MgDev/Web/src/JavaApi/Makefile.am 2015-04-01 15:50:42 UTC (rev 8612)
+++ branches/2.6/MgDev/Web/src/JavaApi/Makefile.am 2015-04-02 11:36:00 UTC (rev 8613)
@@ -30,7 +30,7 @@
nodist_libMapGuideJavaApi_la_SOURCES = MgApi_wrap.cpp
-AM_CXXFLAGS = @CXXFLAGS@ -fno-strict-aliasing -DJAVA
+AM_CXXFLAGS = @CXXFLAGS@ -fno-strict-aliasing -fno-var-tracking-assignments -DJAVA
libMapGuideJavaApi_la_LIBADD = \
-lACE \
Modified: branches/2.6/MgDev/Web/src/JavaApiEx/Makefile.am
===================================================================
--- branches/2.6/MgDev/Web/src/JavaApiEx/Makefile.am 2015-04-01 15:50:42 UTC (rev \
8612)
+++ branches/2.6/MgDev/Web/src/JavaApiEx/Makefile.am 2015-04-02 11:36:00 UTC (rev \
8613) @@ -30,7 +30,7 @@
nodist_libMapGuideJavaApiEx_la_SOURCES = MgApi_wrap.cpp
-AM_CXXFLAGS = @CXXFLAGS@ -fno-strict-aliasing -DJAVA
+AM_CXXFLAGS = @CXXFLAGS@ -fno-strict-aliasing -fno-var-tracking-assignments -DJAVA
libMapGuideJavaApiEx_la_LIBADD = \
-lACE \
Modified: branches/2.6/MgDev/Web/src/PhpApi/Makefile.am
===================================================================
--- branches/2.6/MgDev/Web/src/PhpApi/Makefile.am 2015-04-01 15:50:42 UTC (rev 8612)
+++ branches/2.6/MgDev/Web/src/PhpApi/Makefile.am 2015-04-02 11:36:00 UTC (rev 8613)
@@ -28,7 +28,7 @@
nodist_libphp_MapGuideApi_la_SOURCES = MgApi_wrap.cpp
-AM_CXXFLAGS = @CXXFLAGS@ -DPHP -DPHPPROXYAPI_EXPORTS
+AM_CXXFLAGS = @CXXFLAGS@ -fno-var-tracking-assignments -DPHP -DPHPPROXYAPI_EXPORTS
libphp_MapGuideApi_la_LIBADD = \
-lACE \
Modified: branches/2.6/MgDev/Web/src/schemareport/displayschema.php
===================================================================
--- branches/2.6/MgDev/Web/src/schemareport/displayschema.php 2015-04-01 15:50:42 UTC \
(rev 8612)
+++ branches/2.6/MgDev/Web/src/schemareport/displayschema.php 2015-04-02 11:36:00 UTC \
(rev 8613) @@ -39,6 +39,7 @@
$schemaName = $_GET['schemaName'];
$className = $_GET['className'];
$viewer = $_GET['viewer'];
+ $firstClass = "";
try
{
@@ -58,6 +59,9 @@
$resId = new MgResourceIdentifier($resName);
$classCollection = $featureSrvc->GetClasses($resId, $schemaName);
+ $qualifiedName = $classCollection->GetItem(0);
+ $pos = strrpos($qualifiedName, ':');
+ $firstSchema = substr($qualifiedName, 0, $pos);
$firstClass = substr(strrchr($classCollection->GetItem(0), ":"), \
1); $classNames = new MgStringCollection();
$classNames->Add($className);
@@ -162,10 +166,10 @@
function ShowFirstClass()
{
- document.getElementById("Data_"+"<?php echo \
$firstClass?>").previousSibling.firstChild.src = \
"./images/collapse_pane.png";
- document.getElementById("Data_"+"<?php echo \
$firstClass?>").style.display = 'block';
- document.getElementById("Geom_"+"<?php echo \
$firstClass?>").previousSibling.firstChild.src = \
"./images/collapse_pane.png";
- document.getElementById("Geom_"+"<?php echo \
$firstClass?>").style.display = 'block'; + \
document.getElementById("Data_"+"<?php echo $firstSchema?>"+"_"+"<?php echo \
$firstClass?>").previousSibling.firstChild.src = "./images/collapse_pane.png"; + \
document.getElementById("Data_"+"<?php echo $firstSchema?>"+"_"+"<?php echo \
$firstClass?>").style.display = 'block'; + \
document.getElementById("Geom_"+"<?php echo $firstSchema?>"+"_"+"<?php echo \
$firstClass?>").previousSibling.firstChild.src = "./images/collapse_pane.png"; + \
document.getElementById("Geom_"+"<?php echo $firstSchema?>"+"_"+"<?php echo \
$firstClass?>").style.display = 'block'; }
</script>
_______________________________________________
mapguide-commits mailing list
mapguide-commits@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/mapguide-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic