Implemented removeAnnotation()

Added getAnnotationInt64() and setAnnotationInt64() to make dealing with
dates and times easier.
r=bryner b=319769

browser/components/places/public/nsIAnnotationService.idl

@@ -127,6 +127,14 @@ interface nsIAnnotationService : nsISupports
                             in PRInt32 aValue, in PRInt32 aFlags,
                             in PRInt32 aExpiration);
 
+    /**
+     * Sets an annotation just like setAnnotation, but takes an Int64 as input
+     * for convenience.
+     */
+    void setAnnotationInt64(in nsIURI aURI, in AUTF8String aName,
+                            in PRInt64 aValue, in PRInt32 aFlags,
+                            in PRInt32 aExpiration);
+
     /*
      * Sets an annotation just like setAnnotation, but takes binary data as
      * input. You MUST supply a valid MIME type.
@@ -155,6 +163,14 @@ interface nsIAnnotationService : nsISupports
      */
     PRInt32 getAnnotationInt32(in nsIURI aURI, in AUTF8String aName);
 
+    /**
+     * Same as getAnnotation but a convenience function for C++ for int64s. If
+     * the value doesn't look like an int, returns 0. (this is current sqlite
+     * behavior when asking for an int when there is not one, it will likely
+     * change in the future if we start caching stuff).
+     */
+    PRInt64 getAnnotationInt64(in nsIURI aURI, in AUTF8String aName);
+
     /**
      * Same as getAnnotation but for binary data. This also returns the
      * MIME type.

browser/components/places/src/nsAnnotationService.cpp

@@ -108,6 +108,9 @@ nsAnnotationService::Init()
   rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING("INSERT INTO moz_anno (page, name, mime_type, content, flags, expiration) VALUES (?2, ?3, ?4, ?5, ?6, ?7)"),
                                 getter_AddRefs(mDBAddAnnotation));
   NS_ENSURE_SUCCESS(rv, rv);
+  rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING("DELETE FROM moz_anno WHERE page = ?1 AND name = ?2"),
+                                getter_AddRefs(mDBRemoveAnnotation));
+  NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_OK;
 }
@@ -194,6 +197,38 @@ nsAnnotationService::SetAnnotationInt32(nsIURI* aURI,
 }
 
 
+// nsAnnotationService::SetAnnotationInt64
+
+NS_IMETHODIMP
+nsAnnotationService::SetAnnotationInt64(nsIURI* aURI,
+                                        const nsACString& aName,
+                                        PRInt64 aValue,
+                                        PRInt32 aFlags, PRInt32 aExpiration)
+{
+  mozStorageTransaction transaction(mDBConn, PR_FALSE);
+  mozIStorageStatement* statement; // class var, not owned by this function
+  nsresult rv = StartSetAnnotation(aURI, aName, aFlags, aExpiration, &statement);
+  NS_ENSURE_SUCCESS(rv, rv);
+  mozStorageStatementScoper statementResetter(statement);
+
+  rv = statement->BindInt64Parameter(kAnnoIndex_Content, aValue);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = statement->BindNullParameter(kAnnoIndex_MimeType);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = statement->Execute();
+  NS_ENSURE_SUCCESS(rv, rv);
+  transaction.Commit();
+
+  // should reset the statement; observers may call our service back to get
+  // annotation values!
+  statement->Reset();
+  statementResetter.Abandon();
+  CallSetObservers(aURI, aName);
+  return NS_OK;
+}
+
+
 // nsAnnotationService::SetAnnotationBinary
 
 NS_IMETHODIMP
@@ -286,6 +321,22 @@ nsAnnotationService::GetAnnotationInt32(nsIURI* aURI,
 }
 
 
+// nsAnnotationService::GetAnnotationInt64
+
+NS_IMETHODIMP
+nsAnnotationService::GetAnnotationInt64(nsIURI* aURI,
+                                        const nsACString& aName,
+                                        PRInt64 *_retval)
+{
+  nsresult rv = StartGetAnnotationFromURI(aURI, aName);
+  if (NS_FAILED(rv))
+    return rv;
+  *_retval = mDBGetAnnotationFromURI->AsInt64(kAnnoIndex_Content);
+  mDBGetAnnotationFromURI->Reset();
+  return NS_OK;
+}
+
+
 // nsAnnotationService::GetAnnotationBinary
 
 NS_IMETHODIMP
@@ -409,8 +460,34 @@ NS_IMETHODIMP
 nsAnnotationService::RemoveAnnotation(nsIURI* aURI,
                                       const nsACString& aName)
 {
-  // FIXME
-  return NS_ERROR_NOT_IMPLEMENTED;
+  nsresult rv;
+  nsNavHistory* history = nsNavHistory::GetHistoryService();
+  NS_ENSURE_TRUE(history, NS_ERROR_FAILURE);
+
+  PRInt64 uriID;
+  rv = history->GetUrlIdFor(aURI, &uriID, PR_FALSE);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (uriID == 0) // Check if URI exists.
+    return NS_OK;
+  
+  mozStorageStatementScoper resetter(mDBRemoveAnnotation);
+
+  rv = mDBRemoveAnnotation->BindInt64Parameter(0, uriID);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = mDBRemoveAnnotation->BindUTF8StringParameter(1, aName);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = mDBRemoveAnnotation->Execute();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  resetter.Abandon();
+  
+  // Update observers
+  for (PRInt32 i = 0; i < mObservers.Count(); i ++)
+    mObservers[i]->OnAnnotationRemoved(aURI, aName);
+
+  return NS_OK;
 }
 
 

browser/components/places/src/nsAnnotationService.h

@@ -36,6 +36,9 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#ifndef nsAnnotationService_h___
+#define nsAnnotationService_h___
+
 #include "nsIAnnotationService.h"
 #include "nsCOMArray.h"
 #include "nsCOMPtr.h"
@@ -63,6 +66,7 @@ protected:
   nsCOMPtr<mozIStorageStatement> mDBGetAnnotation;
   nsCOMPtr<mozIStorageStatement> mDBGetAnnotationFromURI;
   nsCOMPtr<mozIStorageStatement> mDBAddAnnotation;
+  nsCOMPtr<mozIStorageStatement> mDBRemoveAnnotation;
 
   nsCOMArray<nsIAnnotationObserver> mObservers;
 
@@ -84,3 +88,5 @@ protected:
                               mozIStorageStatement** aStatement);
   void CallSetObservers(nsIURI* aURI, const nsACString& aName);
 };
+
+#endif /* nsAnnotationService_h___ */