Removed the old news code before pulling over Lei's changes

Removed the SharingPage import from views since it doesn't exist anymore

2 files changed, 14 insertions, 53 deletions

diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index 7fec0456..b7864041 100755
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -45,8 +45,6 @@ from wqflask.correlation_matrix import show_corr_matrix
 from wqflask.correlation import corr_scatter_plot
 from utility import temp_data
 
-from wqflask.dataSharing import SharingInfo, SharingInfoPage
-
 from base import webqtlFormData
 from utility.benchmark import Bench
 
@@ -100,20 +98,20 @@ def tmp_page(img_path):
                             img_base64 = bytesarray )
 
 
-@app.route("/data_sharing")
-def data_sharing_page():
-    print("In data_sharing")
-    fd = webqtlFormData.webqtlFormData(request.args)
-    print("1Have fd")
-    sharingInfoObject = SharingInfo.SharingInfo(request.args['GN_AccessionId'], None)
-    info, htmlfilelist = sharingInfoObject.getBody(infoupdate="")
-    print("type(htmlfilelist):", type(htmlfilelist))
-    htmlfilelist = htmlfilelist.encode("utf-8")
-    #template_vars = SharingInfo.SharingInfo(request.args['GN_AccessionId'], None)
-    print("1 Made it to rendering")
-    return render_template("data_sharing.html",
-                            info=info,
-                            htmlfilelist=htmlfilelist)
+#@app.route("/data_sharing")
+#def data_sharing_page():
+#    print("In data_sharing")
+#    fd = webqtlFormData.webqtlFormData(request.args)
+#    print("1Have fd")
+#    sharingInfoObject = SharingInfo.SharingInfo(request.args['GN_AccessionId'], None)
+#    info, htmlfilelist = sharingInfoObject.getBody(infoupdate="")
+#    print("type(htmlfilelist):", type(htmlfilelist))
+#    htmlfilelist = htmlfilelist.encode("utf-8")
+#    #template_vars = SharingInfo.SharingInfo(request.args['GN_AccessionId'], None)
+#    print("1 Made it to rendering")
+#    return render_template("data_sharing.html",
+#                            info=info,
+#                            htmlfilelist=htmlfilelist)
 
 
 @app.route("/search", methods=('GET',))
@@ -161,17 +159,6 @@ def help():
     doc = docs.Docs("help")
     return render_template("docs.html", **doc.__dict__)
 
-@app.route("/news")
-def news():
-    #variables = whats_new.whats_new()
-    with open("/home/sam/gene/wqflask/wqflask/yaml_data/whats_new.yaml") as fh:
-        contents = fh.read()
-        yamilized = yaml.safe_load(contents)
-        news_items = yamilized['news']
-    for news_item in news_items:
-        print("\nnews_item is: %s\n" % (news_item))
-    return render_template("whats_new.html", news_items=news_items)
-
 @app.route("/references")
 def references():
     doc = docs.Docs("references")
diff --git a/wqflask/wqflask/yaml_data/whats_new.yaml b/wqflask/wqflask/yaml_data/whats_new.yaml
deleted file mode 100755
index 8f41a8f2..00000000
--- a/wqflask/wqflask/yaml_data/whats_new.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-news:
--
-    date: 2012-1-20
-    title: Mouse SNPs from dbSNP have been added to GeneNetwork
-    details: 
-        10 million mouse SNPs from dbSNP (build 128) have been added to Variant Browser.
-        They could be searched by name (e.g. rs31192936) (Implemented by Xiaodong Zhou and Ning Liu).
-
--
-    date: 2012-1-20
-    title: Literature correlation has been update to 2011 version
-    details: 
-        Dr. Ramin Homayouni and Dr. Lijing Xu kindly provide the 2011 version of mouse gene-gene
-        literature correlation matrix to GeneNetwork. (Implemented by Xiaodong Zhou).
-
--
-    date: 2012-1-16
-    title: Expression data set for EPFL/LISP BXD Muscle Affy Mouse Gene 1.0 ST (Dec11) RMA ** has been entered in GeneNetwork
-    details: 
-        Laboratory of Integrative and Systems Physiology
-        (<a href="http://auwerx-lab.epfl.ch/">LISP</a>).
-        This data set is not yet freely available for global analysis.
-        This data set has not yet been used or described in any publication.
-        Please contact Johan Auwerx or Evan Williams at evan.williams@epfl.ch
-        regarding use of these data. (Implemented by J Auwerx, E Williams, LA Rose,
-        RW Williams and A Centeno).
\ No newline at end of file