Skip to content

Commit 6feca53

Browse files
committedMay 26, 2017
[Server] Fix QgsServerProjectUtils readListEntry
1 parent 0f00a52 commit 6feca53

File tree

2 files changed

+27
-5
lines changed

2 files changed

+27
-5
lines changed
 

‎src/server/qgsserverprojectutils.cpp

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,20 @@ QString QgsServerProjectUtils::owsServiceAbstract( const QgsProject &project )
3434

3535
QStringList QgsServerProjectUtils::owsServiceKeywords( const QgsProject &project )
3636
{
37-
return project.readListEntry( QStringLiteral( "WMSKeywordList" ), QStringLiteral( "/" ) );
37+
QStringList keywordList;
38+
QStringList list = project.readListEntry( QStringLiteral( "WMSKeywordList" ), QStringLiteral( "/" ), QStringList() );
39+
if ( !list.isEmpty() )
40+
{
41+
for ( int i = 0; i < list.size(); ++i )
42+
{
43+
QString keyword = list.at( i );
44+
if ( !keyword.isEmpty() )
45+
{
46+
keywordList.append( keyword );
47+
}
48+
}
49+
}
50+
return keywordList;
3851
}
3952

4053
QString QgsServerProjectUtils::owsServiceOnlineResource( const QgsProject &project )
@@ -141,7 +154,19 @@ QStringList QgsServerProjectUtils::wmsRestrictedComposers( const QgsProject &pro
141154

142155
QStringList QgsServerProjectUtils::wmsOutputCrsList( const QgsProject &project )
143156
{
144-
QStringList crsList = project.readListEntry( QStringLiteral( "WMSCrsList" ), QStringLiteral( "/" ), QStringList() );
157+
QStringList crsList;
158+
QStringList wmsCrsList = project.readListEntry( QStringLiteral( "WMSCrsList" ), QStringLiteral( "/" ), QStringList() );
159+
if ( !wmsCrsList.isEmpty() )
160+
{
161+
for ( int i = 0; i < wmsCrsList.size(); ++i )
162+
{
163+
QString crs = wmsCrsList.at( i );
164+
if ( !crs.isEmpty() )
165+
{
166+
crsList.append( crs );
167+
}
168+
}
169+
}
145170
if ( crsList.isEmpty() )
146171
{
147172
QStringList valueList = project.readListEntry( QStringLiteral( "WMSEpsgList" ), QStringLiteral( "/" ), QStringList() );

‎tests/testdata/qgis_server/wcs_getcapabilities.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ Content-Type: text/xml; charset=utf-8
66
<name>WCS</name>
77
<label>QGIS Server test</label>
88
<description><![CDATA[Simple test app.]]></description>
9-
<keywords>
10-
<keyword></keyword>
11-
</keywords>
129
<responsibleParty>
1310
<individualName>Stéphane Brunner</individualName>
1411
<organisationName>QGIS</organisationName>

0 commit comments

Comments
 (0)
Please sign in to comment.