Просмотр исходного кода

Merge pull request #1151 from richardkchapman/librarycase

Library resolution failing for non-lowercase libraries
Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 13 лет назад
Родитель
Сommit
6d4b483174
1 измененных файлов с 4 добавлено и 3 удалено
  1. 4 3
      common/workunit/workunit.cpp

+ 4 - 3
common/workunit/workunit.cpp

@@ -8776,8 +8776,9 @@ IPropertyTree * resolveQueryAlias(IPropertyTree * queryRegistry, const char * al
 {
     StringBuffer xpath;
     unsigned cnt = 0;
-
-    const char * search = alias;
+    StringBuffer lcAlias(alias);
+    lcAlias.toLowerCase();
+    const char * search = lcAlias.str();
     loop
     {
         xpath.clear().append("Alias[@name=\"").append(search).append("\"]/@id");
@@ -8787,7 +8788,7 @@ IPropertyTree * resolveQueryAlias(IPropertyTree * queryRegistry, const char * al
         //Check for too many alias indirections.
         if (cnt++ > 10)
             return NULL;
-        search = queryId;
+        search = lcAlias.clear().append(queryId).toLowerCase().str();
     }
 
     xpath.clear().append("Query[@id=\"").append(search).append("\"]");