[QGIS Commit] r11193 - in trunk/qgis/src/plugins/grass: . scripts

[svn_qgis at osgeo.org]

Author: rugginoso
Date: 2009-07-28 12:23:07 -0400 (Tue, 28 Jul 2009)
New Revision: 11193

Modified:
   trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
   trunk/qgis/src/plugins/grass/scripts/CMakeLists.txt
Log:
Some fixes of grass plug-in:
* Fixed CMakeList.txt of scripts
* Fixed parsing for manual attribute of modules


Modified: trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp	2009-07-28 14:49:44 UTC (rev 11192)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp	2009-07-28 16:23:07 UTC (rev 11193)
@@ -195,10 +195,11 @@
   QDomElement qDocElem = qDoc.documentElement();
 
   // Read GRASS module description
-  QString xName = qDocElem.attribute( "manual" );
-  if ( xName.isEmpty() )
+  QString xName = qDocElem.attribute( "module" );
+  QString xDocName = qDocElem.attribute( "manual" );
+  if ( xDocName.isEmpty() )
   {
-    xName = qDocElem.attribute( "module" );
+    xDocName = xName;
   }
 
   // Binary modules on windows has .exe extension
@@ -251,7 +252,7 @@
 
   // Create manual if available
   QString gisBase = getenv( "GISBASE" );
-  QString manPath = gisBase + "/docs/html/" + xName + ".html";
+  QString manPath = gisBase + "/docs/html/" + xDocName + ".html";
   QFile manFile( manPath );
   if ( manFile.exists() )
   {

Modified: trunk/qgis/src/plugins/grass/scripts/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/grass/scripts/CMakeLists.txt	2009-07-28 14:49:44 UTC (rev 11192)
+++ trunk/qgis/src/plugins/grass/scripts/CMakeLists.txt	2009-07-28 16:23:07 UTC (rev 11193)
@@ -1,6 +1,6 @@
-IF (GRASS_NUM_VERSION GREATER 60400)
+IF (GRASS_NUM_VERSION GREATER 60300)
 FILE (GLOB MODULE_FILES *.py )
 INSTALL (FILES ${MODULE_FILES}
          DESTINATION ${QGIS_DATA_DIR}/grass/scripts
 	 PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
-ENDIF (GRASS_NUM_VERSION GREATER 60400)
+ENDIF (GRASS_NUM_VERSION GREATER 60300)