Skip to content

Commit 407c065

Browse files
author
rugginoso
committed
Some fixes of grass plug-in:
* Fixed CMakeList.txt of scripts * Fixed parsing for manual attribute of modules git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11193 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 9111808 commit 407c065

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/plugins/grass/qgsgrassmodule.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,11 @@ QgsGrassModule::QgsGrassModule( QgsGrassTools *tools, QString moduleName, QgisIn
195195
QDomElement qDocElem = qDoc.documentElement();
196196

197197
// Read GRASS module description
198-
QString xName = qDocElem.attribute( "manual" );
199-
if ( xName.isEmpty() )
198+
QString xName = qDocElem.attribute( "module" );
199+
QString xDocName = qDocElem.attribute( "manual" );
200+
if ( xDocName.isEmpty() )
200201
{
201-
xName = qDocElem.attribute( "module" );
202+
xDocName = xName;
202203
}
203204

204205
// Binary modules on windows has .exe extension
@@ -251,7 +252,7 @@ QgsGrassModule::QgsGrassModule( QgsGrassTools *tools, QString moduleName, QgisIn
251252

252253
// Create manual if available
253254
QString gisBase = getenv( "GISBASE" );
254-
QString manPath = gisBase + "/docs/html/" + xName + ".html";
255+
QString manPath = gisBase + "/docs/html/" + xDocName + ".html";
255256
QFile manFile( manPath );
256257
if ( manFile.exists() )
257258
{
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
IF (GRASS_NUM_VERSION GREATER 60400)
1+
IF (GRASS_NUM_VERSION GREATER 60300)
22
FILE (GLOB MODULE_FILES *.py )
33
INSTALL (FILES ${MODULE_FILES}
44
DESTINATION ${QGIS_DATA_DIR}/grass/scripts
55
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
6-
ENDIF (GRASS_NUM_VERSION GREATER 60400)
6+
ENDIF (GRASS_NUM_VERSION GREATER 60300)

0 commit comments

Comments
 (0)