Bug 376798 - QueriesToQueryString prefixes the first parameter with an ampersand. r=dietrich.

2007-04-10 00:30:52 +00:00 · 2007-04-10 00:30:52 +00:00 · 030f5b78ef
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@ -331,7 +331,7 @@
              <menupopup id="goPopup"
                         type="places"
                         onpopupshowing="HistoryMenu.onPoupShowing(this);"
-                         place="place:&amp;beginTime=-2592000000000&amp;beginTimeRef=1&amp;endTime=7200000000&amp;endTimeRef=2&amp;type=0&amp;sort=4&amp;maxResults=10">
+                         place="place:beginTime=-2592000000000&amp;beginTimeRef=1&amp;endTime=7200000000&amp;endTimeRef=2&amp;type=0&amp;sort=4&amp;maxResults=10">
                <menuitem label="&backCmd.label;"
 #ifdef XP_MACOSX
                          key="goBackKb2"
@ -462,7 +462,7 @@
        ondragexit="PlacesMenuDNDController.onDragExit(event);">
    <menupopup id="bookmarksMenuPopup"
               type="places" asyncinit="true"
-               place="place:&amp;folder=2&amp;group=3&amp;expandQueries=1"
+               place="place:folder=2&amp;group=3&amp;expandQueries=1"
               context="placesContext"
               openInTabs="children"
               oncommand="BookmarksEventHandler.onCommand(event);"
--- a/browser/components/places/content/bookmarkProperties.xul
+++ b/browser/components/places/content/bookmarkProperties.xul
@ -154,7 +154,7 @@
        persist="height"
        onselect="BookmarkPropertiesPanel.onFolderTreeSelect();"
        showRoot="true"
-        place="place:&amp;folder=2&amp;group=3&amp;excludeItems=1&amp;excludeQueries=1&amp;excludeReadOnlyFolders=1"
+        place="place:folder=2&amp;group=3&amp;excludeItems=1&amp;excludeQueries=1&amp;excludeReadOnlyFolders=1"
        hidecolumnpicker="true">
    <treecols>
      <treecol id="title" flex="1" primary="true" hideheader="true"/>
--- a/browser/components/places/content/bookmarksPanel.xul
+++ b/browser/components/places/content/bookmarksPanel.xul
@ -70,7 +70,7 @@
  <tree id="bookmarks-view" class="placesTree" type="places"
        flex="1"
        hidecolumnpicker="true"
-        place="place:&amp;folder=2"
+        place="place:folder=2"
        context="placesContext"
        onkeypress="if (event.keyCode == 13) this.controller.openSelectedNodeWithEvent(event);"
        onclick="SidebarUtils.handleClick(this, event);">
--- a/browser/components/places/content/controller.js
+++ b/browser/components/places/content/controller.js
@ -43,10 +43,10 @@ const NHRVO = Ci.nsINavHistoryResultViewObserver;

 // These need to be kept in sync with the meaning of these roots in 
 // default_places.html!
-const ORGANIZER_ROOT_HISTORY_UNSORTED = "place:&beginTime=-2592000000000&beginTimeRef=1&endTime=7200000000&endTimeRef=2&type=1"
+const ORGANIZER_ROOT_HISTORY_UNSORTED = "place:beginTime=-2592000000000&beginTimeRef=1&endTime=7200000000&endTimeRef=2&type=1"
 const ORGANIZER_ROOT_HISTORY = ORGANIZER_ROOT_HISTORY_UNSORTED + "&sort=" + Ci.nsINavHistoryQueryOptions.SORT_BY_DATE_DESCENDING;
-const ORGANIZER_ROOT_BOOKMARKS = "place:&folder=2&group=3&excludeItems=1";
-const ORGANIZER_SUBSCRIPTIONS_QUERY = "place:&annotation=livemark%2FfeedURI";
+const ORGANIZER_ROOT_BOOKMARKS = "place:folder=2&group=3&excludeItems=1";
+const ORGANIZER_SUBSCRIPTIONS_QUERY = "place:annotation=livemark%2FfeedURI";

 // No change to the view, preserve current selection
 const RELOAD_ACTION_NOTHING = 0;
--- a/browser/components/places/content/history-panel.xul
+++ b/browser/components/places/content/history-panel.xul
@ -120,7 +120,7 @@
  <tree id="historyTree"
        flex="1"
        type="places"
-        place="place:&amp;beginTime=-2592000000000&amp;beginTimeRef=1&amp;endTime=7200000000&amp;endTimeRef=2&amp;type=1"
+        place="place:beginTime=-2592000000000&amp;beginTimeRef=1&amp;endTime=7200000000&amp;endTimeRef=2&amp;type=1"
        context="placesContext"
        onkeypress="if (event.keyCode == 13) this.controller.openSelectedNodeWithEvent(event);"
        hidecolumnpicker="true"
--- a/browser/components/places/content/moveBookmarks.xul
+++ b/browser/components/places/content/moveBookmarks.xul
@ -67,7 +67,7 @@
            class="placesTree"
            flex="1"
            type="places" 
-            place="place:&amp;folder=1&amp;group=3&amp;excludeItems=1&amp;excludeQueries=1&amp;excludeReadOnlyFolders=1" 
+            place="place:folder=1&amp;group=3&amp;excludeItems=1&amp;excludeQueries=1&amp;excludeReadOnlyFolders=1" 
            hidecolumnpicker="true">
        <treecols>
          <treecol id="title" flex="1" primary="true" hideheader="true"/>
--- a/browser/components/places/content/places.xul
+++ b/browser/components/places/content/places.xul
@ -341,7 +341,7 @@
          class="placesTree"
          type="places"
          showRoot="true"
-          place="place:&amp;folder=2&amp;group=3&amp;excludeItems=1"
+          place="place:folder=2&amp;group=3&amp;excludeItems=1"
          hidecolumnpicker="true" context="placesContext"
          onselect="PlacesOrganizer.onPlaceSelected(true);
                    PlacesOrganizer.updateStatusBarForView(this);"
--- a/browser/components/preferences/selectBookmark.xul
+++ b/browser/components/preferences/selectBookmark.xul
@ -25,7 +25,7 @@
  
  <tree id="bookmarks" flex="1" type="places" 
        style="height: 15em;" 
-        place="place:&amp;folder=1&amp;group=3&amp;excludeQueries=1"
+        place="place:folder=1&amp;group=3&amp;excludeQueries=1"
        hidecolumnpicker="true"
        seltype="single"
        ondblclick="SelectBookmarkDialog.onItemDblClick();"
--- a/toolkit/components/places/src/nsNavHistoryQuery.cpp
+++ b/toolkit/components/places/src/nsNavHistoryQuery.cpp
@ -263,12 +263,12 @@ nsNavHistory::QueriesToQueryString(nsINavHistoryQuery **aQueries,
  nsCOMPtr<nsNavHistoryQueryOptions> options = do_QueryInterface(aOptions);
  NS_ENSURE_TRUE(options, NS_ERROR_INVALID_ARG);

-  aQueryString.AssignLiteral("place:");
+  nsCAutoString queryString;
  for (PRUint32 queryIndex = 0; queryIndex < aQueryCount;  queryIndex ++) {
    nsINavHistoryQuery* query = aQueries[queryIndex];
    if (queryIndex > 0) {
-      AppendAmpersandIfNonempty(aQueryString);
-      aQueryString += NS_LITERAL_CSTRING(QUERYKEY_SEPARATOR);
+      AppendAmpersandIfNonempty(queryString);
+      queryString += NS_LITERAL_CSTRING(QUERYKEY_SEPARATOR);
    }

    PRBool hasIt;
@ -276,10 +276,10 @@ nsNavHistory::QueriesToQueryString(nsINavHistoryQuery **aQueries,
    // begin time
    query->GetHasBeginTime(&hasIt);
    if (hasIt) {
-      AppendInt64KeyValueIfNonzero(aQueryString,
+      AppendInt64KeyValueIfNonzero(queryString,
                                   NS_LITERAL_CSTRING(QUERYKEY_BEGIN_TIME),
                                   query, &nsINavHistoryQuery::GetBeginTime);
-      AppendUint32KeyValueIfNonzero(aQueryString,
+      AppendUint32KeyValueIfNonzero(queryString,
                                    NS_LITERAL_CSTRING(QUERYKEY_BEGIN_TIME_REFERENCE),
                                    query, &nsINavHistoryQuery::GetBeginTimeReference);
    }
@ -287,10 +287,10 @@ nsNavHistory::QueriesToQueryString(nsINavHistoryQuery **aQueries,
    // end time
    query->GetHasEndTime(&hasIt);
    if (hasIt) {
-      AppendInt64KeyValueIfNonzero(aQueryString,
+      AppendInt64KeyValueIfNonzero(queryString,
                                   NS_LITERAL_CSTRING(QUERYKEY_END_TIME),
                                   query, &nsINavHistoryQuery::GetEndTime);
-      AppendUint32KeyValueIfNonzero(aQueryString,
+      AppendUint32KeyValueIfNonzero(queryString,
                                    NS_LITERAL_CSTRING(QUERYKEY_END_TIME_REFERENCE),
                                    query, &nsINavHistoryQuery::GetEndTimeReference);
    }
@ -305,28 +305,28 @@ nsNavHistory::QueriesToQueryString(nsINavHistoryQuery **aQueries,
                      url_XAlphas))
        return NS_ERROR_OUT_OF_MEMORY;

-      AppendAmpersandIfNonempty(aQueryString);
-      aQueryString += NS_LITERAL_CSTRING(QUERYKEY_SEARCH_TERMS "=");
-      aQueryString += escapedTerms;
+      AppendAmpersandIfNonempty(queryString);
+      queryString += NS_LITERAL_CSTRING(QUERYKEY_SEARCH_TERMS "=");
+      queryString += escapedTerms;
    }

    // min and max visits
    PRInt32 minVisits;
    if (NS_SUCCEEDED(query->GetMinVisits(&minVisits)) && minVisits >= 0) {
-      AppendAmpersandIfNonempty(aQueryString);
-      aQueryString.Append(NS_LITERAL_CSTRING(QUERYKEY_MIN_VISITS "="));
-      AppendInt32(aQueryString, minVisits);
+      AppendAmpersandIfNonempty(queryString);
+      queryString.Append(NS_LITERAL_CSTRING(QUERYKEY_MIN_VISITS "="));
+      AppendInt32(queryString, minVisits);
    }

    PRInt32 maxVisits;
    if (NS_SUCCEEDED(query->GetMaxVisits(&maxVisits)) && maxVisits >= 0) {
-      AppendAmpersandIfNonempty(aQueryString);
-      aQueryString.Append(NS_LITERAL_CSTRING(QUERYKEY_MAX_VISITS "="));
-      AppendInt32(aQueryString, maxVisits);
+      AppendAmpersandIfNonempty(queryString);
+      queryString.Append(NS_LITERAL_CSTRING(QUERYKEY_MAX_VISITS "="));
+      AppendInt32(queryString, maxVisits);
    }

    // only bookmarked
-    AppendBoolKeyValueIfTrue(aQueryString,
+    AppendBoolKeyValueIfTrue(queryString,
                             NS_LITERAL_CSTRING(QUERYKEY_ONLY_BOOKMARKED),
                             query, &nsINavHistoryQuery::GetOnlyBookmarked);

@ -335,7 +335,7 @@ nsNavHistory::QueriesToQueryString(nsINavHistoryQuery **aQueries,
    // which is valid
    query->GetHasDomain(&hasIt);
    if (hasIt) {
-      AppendBoolKeyValueIfTrue(aQueryString,
+      AppendBoolKeyValueIfTrue(queryString,
                               NS_LITERAL_CSTRING(QUERYKEY_DOMAIN_IS_HOST),
                               query, &nsINavHistoryQuery::GetDomainIsHost);
      nsCAutoString domain;
@ -345,9 +345,9 @@ nsNavHistory::QueriesToQueryString(nsINavHistoryQuery **aQueries,
      PRBool success = NS_Escape(domain, escapedDomain, url_XAlphas);
      NS_ENSURE_TRUE(success, NS_ERROR_OUT_OF_MEMORY);

-      AppendAmpersandIfNonempty(aQueryString);
-      aQueryString.Append(NS_LITERAL_CSTRING(QUERYKEY_DOMAIN "="));
-      aQueryString.Append(escapedDomain);
+      AppendAmpersandIfNonempty(queryString);
+      queryString.Append(NS_LITERAL_CSTRING(QUERYKEY_DOMAIN "="));
+      queryString.Append(escapedDomain);
    }

    // uri
@ -366,27 +366,27 @@ nsNavHistory::QueriesToQueryString(nsINavHistoryQuery **aQueries,
      PRBool success = NS_Escape(uriSpec, escaped, url_XAlphas);
      NS_ENSURE_TRUE(success, NS_ERROR_OUT_OF_MEMORY);

-      AppendAmpersandIfNonempty(aQueryString);
-      aQueryString.Append(NS_LITERAL_CSTRING(QUERYKEY_URI "="));
-      aQueryString.Append(escaped);
+      AppendAmpersandIfNonempty(queryString);
+      queryString.Append(NS_LITERAL_CSTRING(QUERYKEY_URI "="));
+      queryString.Append(escaped);
    }

    // annotation
    query->GetHasAnnotation(&hasIt);
    if (hasIt) {
-      AppendAmpersandIfNonempty(aQueryString);
+      AppendAmpersandIfNonempty(queryString);
      PRBool annotationIsNot;
      query->GetAnnotationIsNot(&annotationIsNot);
      if (annotationIsNot)
-        aQueryString.AppendLiteral(QUERYKEY_NOTANNOTATION "=");
+        queryString.AppendLiteral(QUERYKEY_NOTANNOTATION "=");
      else
-        aQueryString.AppendLiteral(QUERYKEY_ANNOTATION "=");
+        queryString.AppendLiteral(QUERYKEY_ANNOTATION "=");
      nsCAutoString annot;
      query->GetAnnotation(annot);
      nsCAutoString escaped;
      PRBool success = NS_Escape(annot, escaped, url_XAlphas);
      NS_ENSURE_TRUE(success, NS_ERROR_OUT_OF_MEMORY);
-      aQueryString.Append(escaped);
+      queryString.Append(escaped);
    }

    // folders
@ -394,9 +394,9 @@ nsNavHistory::QueriesToQueryString(nsINavHistoryQuery **aQueries,
    PRUint32 folderCount = 0;
    query->GetFolders(&folderCount, &folders);
    for (PRUint32 i = 0; i < folderCount; ++i) {
-      AppendAmpersandIfNonempty(aQueryString);
-      aQueryString += NS_LITERAL_CSTRING(QUERYKEY_FOLDER "=");
-      AppendInt64(aQueryString, folders[0]);
+      AppendAmpersandIfNonempty(queryString);
+      queryString += NS_LITERAL_CSTRING(QUERYKEY_FOLDER "=");
+      AppendInt64(queryString, folders[0]);
    }
    nsMemory::Free(folders);
  }
@ -405,74 +405,75 @@ nsNavHistory::QueriesToQueryString(nsINavHistoryQuery **aQueries,
  PRUint32 groupCount;
  const PRUint32* groups = options->GroupingMode(&groupCount);
  for (PRUint32 i = 0; i < groupCount; i ++) {
-    AppendAmpersandIfNonempty(aQueryString);
-    aQueryString += NS_LITERAL_CSTRING(QUERYKEY_GROUP "=");
-    AppendInt32(aQueryString, groups[i]);
+    AppendAmpersandIfNonempty(queryString);
+    queryString += NS_LITERAL_CSTRING(QUERYKEY_GROUP "=");
+    AppendInt32(queryString, groups[i]);
  }

  // sorting
  if (options->SortingMode() != nsINavHistoryQueryOptions::SORT_BY_NONE) {
-    AppendAmpersandIfNonempty(aQueryString);
-    aQueryString += NS_LITERAL_CSTRING(QUERYKEY_SORT "=");
-    AppendInt32(aQueryString, options->SortingMode());
+    AppendAmpersandIfNonempty(queryString);
+    queryString += NS_LITERAL_CSTRING(QUERYKEY_SORT "=");
+    AppendInt32(queryString, options->SortingMode());
  }

  // result type
  if (options->ResultType() != nsINavHistoryQueryOptions::RESULTS_AS_URI) {
-    AppendAmpersandIfNonempty(aQueryString);
-    aQueryString += NS_LITERAL_CSTRING(QUERYKEY_RESULT_TYPE "=");
-    AppendInt32(aQueryString, options->ResultType());
+    AppendAmpersandIfNonempty(queryString);
+    queryString += NS_LITERAL_CSTRING(QUERYKEY_RESULT_TYPE "=");
+    AppendInt32(queryString, options->ResultType());
  }

  // exclude items
  if (options->ExcludeItems()) {
-    AppendAmpersandIfNonempty(aQueryString);
-    aQueryString += NS_LITERAL_CSTRING(QUERYKEY_EXCLUDE_ITEMS "=1");
+    AppendAmpersandIfNonempty(queryString);
+    queryString += NS_LITERAL_CSTRING(QUERYKEY_EXCLUDE_ITEMS "=1");
  }

  // exclude queries
  if (options->ExcludeQueries()) {
-    AppendAmpersandIfNonempty(aQueryString);
-    aQueryString += NS_LITERAL_CSTRING(QUERYKEY_EXCLUDE_QUERIES "=1");
+    AppendAmpersandIfNonempty(queryString);
+    queryString += NS_LITERAL_CSTRING(QUERYKEY_EXCLUDE_QUERIES "=1");
  }

  // exclude read only folders
  if (options->ExcludeReadOnlyFolders()) {
-    AppendAmpersandIfNonempty(aQueryString);
-    aQueryString += NS_LITERAL_CSTRING(QUERYKEY_EXCLUDE_READ_ONLY_FOLDERS "=1");
+    AppendAmpersandIfNonempty(queryString);
+    queryString += NS_LITERAL_CSTRING(QUERYKEY_EXCLUDE_READ_ONLY_FOLDERS "=1");
  }

  // expand queries
  if (options->ExpandQueries()) {
-    AppendAmpersandIfNonempty(aQueryString);
-    aQueryString += NS_LITERAL_CSTRING(QUERYKEY_EXPAND_QUERIES "=1");
+    AppendAmpersandIfNonempty(queryString);
+    queryString += NS_LITERAL_CSTRING(QUERYKEY_EXPAND_QUERIES "=1");
  }

  // title mode
  if (options->ForceOriginalTitle()) {
-    AppendAmpersandIfNonempty(aQueryString);
-    aQueryString += NS_LITERAL_CSTRING(QUERYKEY_FORCE_ORIGINAL_TITLE "=1");
+    AppendAmpersandIfNonempty(queryString);
+    queryString += NS_LITERAL_CSTRING(QUERYKEY_FORCE_ORIGINAL_TITLE "=1");
  }

  // include hidden
  if (options->IncludeHidden()) {
-    AppendAmpersandIfNonempty(aQueryString);
-    aQueryString += NS_LITERAL_CSTRING(QUERYKEY_INCLUDE_HIDDEN "=1");
+    AppendAmpersandIfNonempty(queryString);
+    queryString += NS_LITERAL_CSTRING(QUERYKEY_INCLUDE_HIDDEN "=1");
  }

  // show sessions
  if (options->ShowSessions()) {
-    AppendAmpersandIfNonempty(aQueryString);
-    aQueryString += NS_LITERAL_CSTRING(QUERYKEY_SHOW_SESSIONS "=1");
+    AppendAmpersandIfNonempty(queryString);
+    queryString += NS_LITERAL_CSTRING(QUERYKEY_SHOW_SESSIONS "=1");
  }

  // max results
  if (options->MaxResults()) {
-    AppendAmpersandIfNonempty(aQueryString);
-    aQueryString += NS_LITERAL_CSTRING(QUERYKEY_MAX_RESULTS "=");
-    AppendInt32(aQueryString, options->MaxResults());
+    AppendAmpersandIfNonempty(queryString);
+    queryString += NS_LITERAL_CSTRING(QUERYKEY_MAX_RESULTS "=");
+    AppendInt32(queryString, options->MaxResults());
  }

+  aQueryString.Assign(NS_LITERAL_CSTRING("place:") + queryString);
  return NS_OK;
 }