[BUGFIX] The way layer's shortname is write in QGIS project and used …

…in QGIS Server
qgis · Apr 21, 2016 · 3200062 · 3200062
1 parent e6bb623
commit 3200062
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
@@ -69,6 +69,9 @@ QgsMapLayer::QgsMapLayer( QgsMapLayer::LayerType type,
   mLayerName = capitaliseLayerName( mLayerOrigName );
   QgsDebugMsg( "display name: '" + mLayerName + '\'' );
 
+  mShortName = "";
+  //mShortName.replace( QRegExp( "[\\W]" ), "_" );
+
   // Generate the unique ID of this layer
   QDateTime dt = QDateTime::currentDateTime();
   mID = lyrname + dt.toString( "yyyyMMddhhmmsszzz" );
@@ -653,26 +656,34 @@ bool QgsMapLayer::writeLayerXML( QDomElement& layerElement, QDomDocument& docume
   QDomElement layerName = document.createElement( "layername" );
   QDomText layerNameText = document.createTextNode( originalName() );
   layerName.appendChild( layerNameText );
+  layerElement.appendChild( layerName );
 
   // layer short name
-  QDomElement layerShortName = document.createElement( "shortname" );
-  QDomText layerShortNameText = document.createTextNode( shortName() );
-  layerShortName.appendChild( layerShortNameText );
+  if ( !mShortName.isEmpty() )
+  {
+    QDomElement layerShortName = document.createElement( "shortname" );
+    QDomText layerShortNameText = document.createTextNode( mShortName );
+    layerShortName.appendChild( layerShortNameText );
+    layerElement.appendChild( layerShortName );
+  }
 
   // layer title
-  QDomElement layerTitle = document.createElement( "title" );
-  QDomText layerTitleText = document.createTextNode( title() );
-  layerTitle.appendChild( layerTitleText );
+  if ( !mTitle.isEmpty() )
+  {
+    QDomElement layerTitle = document.createElement( "title" );
+    QDomText layerTitleText = document.createTextNode( mTitle );
+    layerTitle.appendChild( layerTitleText );
+    layerElement.appendChild( layerTitle );
+  }
 
   // layer abstract
-  QDomElement layerAbstract = document.createElement( "abstract" );
-  QDomText layerAbstractText = document.createTextNode( abstract() );
-  layerAbstract.appendChild( layerAbstractText );
-
-  layerElement.appendChild( layerName );
-  layerElement.appendChild( layerShortName );
-  layerElement.appendChild( layerTitle );
-  layerElement.appendChild( layerAbstract );
+  if ( !mAbstract.isEmpty() )
+  {
+    QDomElement layerAbstract = document.createElement( "abstract" );
+    QDomText layerAbstractText = document.createTextNode( mAbstract );
+    layerAbstract.appendChild( layerAbstractText );
+    layerElement.appendChild( layerAbstract );
+  }
 
   // layer keyword list
   QStringList keywordStringList = keywordList().split( ',' );

diff --git a/src/server/qgsserverprojectparser.cpp b/src/server/qgsserverprojectparser.cpp
@@ -50,7 +50,7 @@ QgsServerProjectParser::QgsServerProjectParser( QDomDocument* xmlDoc, const QStr
       currentElement = layerNodeList.at( i ).toElement();
       mProjectLayerElements.push_back( currentElement );
       QString lName = layerShortName( currentElement );
-      if ( lName.isNull() )
+      if ( lName.isEmpty() )
         lName = layerName( currentElement );
       mProjectLayerElementsByName.insert( lName, currentElement );
       mProjectLayerElementsById.insert( layerId( currentElement ), currentElement );