keep working towards common http PBv0.0.23

2 files changed, 10 insertions, 25 deletions

diff --git a/handlePatches.go b/handlePatches.go
index f270d74..730d04f 100644
--- a/handlePatches.go
+++ b/handlePatches.go
@@ -9,22 +9,11 @@ import (
 	"go.wit.com/log"
 )
 
-func handlePatches(w http.ResponseWriter, r *http.Request, data []byte) error {
-	pb, err := marshalPatchesPB(r, data)
-	if err != nil {
-		return sendPatchesError(w, pb, err)
-	}
-
+func handlePatches(w http.ResponseWriter, pb *forgepb.Patches) error {
 	route := pb.HttpRequest.Route
-	if route == "" {
-		route = cleanURL(r.URL.Path)
-	}
-	if route == "" {
-		route = "route was blank"
-	}
+
 	log.Info("GOT PATCHES ROUTE", route, "with # patches =", pb.Len())
 	if strings.HasPrefix(route, "/patches/old") {
-		processPatchesOldPB(r, pb)
 	} else if strings.HasPrefix(route, "/patches/new") {
 		log.Info("add new patches")
 	} else {
@@ -45,12 +34,6 @@ func sendPatchesError(w http.ResponseWriter, r *forgepb.Patches, err error) erro
 	return nil
 }
 
-func processPatchesOldPB(r *http.Request, pb *forgepb.Patches) error {
-	log.Info("check out these patches")
-	pb.PrintTable()
-	return nil
-}
-
 func marshalPatchesPB(r *http.Request, msg []byte) (*forgepb.Patches, error) {
 	pb := forgepb.NewPatches()
 
diff --git a/http.go b/http.go
index a88d6c3..8637d14 100644
--- a/http.go
+++ b/http.go
@@ -117,7 +117,14 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if strings.HasPrefix(route, "/patches/") {
-		handlePatches(w, r, reqPB.Body)
+		/*
+			pb, err := forgepb.GetPatchesFromHttp(reqPB)
+			if err != nil {
+				log.Info("error converting to patches PB")
+				return
+			}
+			handlePatches(w, pb)
+		*/
 		return
 	}
 
@@ -150,11 +157,6 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if strings.HasPrefix(route, "/patches/") {
-		handlePatches(w, r, reqPB.Body)
-		return
-	}
-
 	if route == "/patchset" {
 		if err := savePatchset(w, reqPB.Body); err != nil {
 			log.Warn("forged /patchset error", err)