Skip to content

Commit 6186c9f

Browse files
committed
Added some extra debug info for project path
1 parent e07596c commit 6186c9f

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

src/mapserver/qgis_map_serv.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,11 @@ int main( int argc, char * argv[] )
242242
if ( mapFileIt != parameterMap.end() )
243243
{
244244
configFilePath = mapFileIt->second;
245+
QgsDebugMsg( QString( "Configuration file path set to: %1" ).arg( defaultConfigFilePath ) );
246+
}
247+
else
248+
{
249+
QgsDebugMsg( QString( "Using default configuration file path: %1" ).arg( defaultConfigFilePath ) );
245250
}
246251

247252
QgsConfigParser* adminConfigParser = QgsConfigCache::instance()->searchConfiguration( configFilePath );

src/mapserver/qgsprojectparser.cpp

+11-3
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ void QgsProjectParser::addLayers( QDomDocument &doc,
149149
{
150150
//add layers from other project files and embed into this group
151151
QString project = convertToAbsolutePath( currentChildElem.attribute( "project" ) );
152+
QgsDebugMsg( QString( "Project path: %1" ).arg( project ) );
152153
QString embeddedGroupName = currentChildElem.attribute( "name" );
153154
QgsProjectParser* p = dynamic_cast<QgsProjectParser*>( QgsConfigCache::instance()->searchConfiguration( project ) );
154155
if ( p )
@@ -360,7 +361,9 @@ QList<QgsMapLayer*> QgsProjectParser::mapLayerFromStyle( const QString& lName, c
360361
{
361362
if ( groupIt->attribute( "embedded" ) == "1" ) //requested group is embedded from another project
362363
{
363-
QgsProjectParser* p = dynamic_cast<QgsProjectParser*>( QgsConfigCache::instance()->searchConfiguration( convertToAbsolutePath( groupIt->attribute( "project" ) ) ) );
364+
QString project = convertToAbsolutePath( groupIt->attribute( "project" ) );
365+
QgsDebugMsg( QString( "Project path: %1" ).arg( project ) );
366+
QgsProjectParser* p = dynamic_cast<QgsProjectParser*>( QgsConfigCache::instance()->searchConfiguration( project ) );
364367
if ( p )
365368
{
366369
QList<QDomElement> pGroupElems = p->legendGroupElements();
@@ -417,6 +420,7 @@ QList<QgsMapLayer*> QgsProjectParser::mapLayerFromStyle( const QString& lName, c
417420
{
418421
QString id = layerIt.value().attribute( "id" );
419422
QString project = layerIt.value().attribute( "project" );
423+
QgsDebugMsg( QString( "Project path: %1" ).arg( project ) );
420424

421425
//get config parser from cache
422426
QgsProjectParser* otherParser = dynamic_cast<QgsProjectParser*>( QgsConfigCache::instance()->searchConfiguration( project ) );
@@ -443,7 +447,9 @@ QList<QgsMapLayer*> QgsProjectParser::mapLayerFromStyle( const QString& lName, c
443447
{
444448
if ( groupIt->attribute( "embedded" ) == "1" )
445449
{
446-
QgsProjectParser* p = dynamic_cast<QgsProjectParser*>( QgsConfigCache::instance()->searchConfiguration( convertToAbsolutePath( groupIt->attribute( "project" ) ) ) );
450+
QString project = convertToAbsolutePath( groupIt->attribute( "project" ) );
451+
QgsDebugMsg( QString( "Project path: %1" ).arg( project ) );
452+
QgsProjectParser* p = dynamic_cast<QgsProjectParser*>( QgsConfigCache::instance()->searchConfiguration( project ) );
447453
if ( p )
448454
{
449455
QMap< QString, QDomElement > pLayers = p->projectLayerElementsByName();
@@ -889,7 +895,9 @@ QgsMapLayer* QgsProjectParser::createLayerFromElement( const QDomElement& elem )
889895
}
890896
else if ( elem.attribute( "embedded" ) == "1" ) //layer is embedded from another project file
891897
{
892-
QgsProjectParser* otherConfig = dynamic_cast<QgsProjectParser*>( QgsConfigCache::instance()->searchConfiguration( convertToAbsolutePath( elem.attribute( "project" ) ) ) );
898+
QString project = convertToAbsolutePath( elem.attribute( "project" ) );
899+
QgsDebugMsg( QString( "Project path: %1" ).arg( project ) );
900+
QgsProjectParser* otherConfig = dynamic_cast<QgsProjectParser*>( QgsConfigCache::instance()->searchConfiguration( project ) );
893901
if ( !otherConfig )
894902
{
895903
return 0;

0 commit comments

Comments
 (0)