alex

catalog/management/commands/gunsNroses.py

+from django.core.management.base import BaseCommand, CommandError
+from catalog.models import User, News, Publisher, Topic, audioTime, Search
+from django.db.models import Q
+from django.core.paginator import Paginator
+
+import os
+#import simplejson as json
+import json
+
+import sys
+sys.path.append("/home/mario/git/")
+from Guns_N_Roses import GunsAndRoses
+import datetime
+class Command(BaseCommand):
+	help = 'Report database'
+
+
+	def add_arguments(self, parser):
+		parser.add_argument('model', nargs=1, type=str) #(options['basedir'][0]
+
+	def handle(self, *args, **options):
+		clf = GunsAndRoses.load_model(options['model'][0])
+		pub=[3, 46, 39, 43, 45, 41, 40, 6, 7, 8, 27, 9, 10, 12, 13, 14, 15, 17, 31, 21, 24]
+		publishers = Publisher.objects.all().filter(id__in=pub)
+		newsList = News.objects.all().filter(publisher__in=publishers).filter(date__gte=datetime.date(2014, 1, 1)).order_by('id')
+		p = Paginator(newsList, 50)
+
+		categories = dict()
+
+		doclist = list()
+		for i in range (1,p.num_pages):
+#			print(i)
+			docs_new = [d for d in p.page(i) if d.text!=""]
+			docs_text = [d.text.replace("\xa0", " ").replace("\x93", "").replace("\x94", "").replace('"', '').replace("'","") for d in docs_new ]
+			docs_id = [d.id for d in docs_new ]
+			predicted_classes = GunsAndRoses.predict_classes(docs_text, clf)
+			ii = 0;
+			for (category, document) in predicted_classes:
+				item = dict()
+				item['category'] = category
+				item['text'] = document
+				item['id'] = docs_id[ii]
+				doclist.append(item)
+				if category not in categories:
+					categories[category] = 0;
+				categories[category] +=1
+				ii+=1
+			finish = True
+			for c in categories:
+				finish = finish and categories[c] >=1000
+			if finish:
+				break
+
+
+		
+#		for l in doclist:
+#			print(l)
+#		print 
+		print(categories)
+		with open('data.json', 'w', encoding='utf8') as outfile:
+			s = json.dumps(doclist,  ensure_ascii=False, indent=2)
+			print (s)
+			outfile.write(s)
+
+
+

catalog/static/css/login.css

@@ -15,15 +15,23 @@ video {
 
 .geointInfo
 {
+	border: 0px solid white;
+	text-align:center;
+	opacity: 0.7;
+	width:100%;
 	position:fixed;
-	right: 50pt;
-	bottom:0px;
+	bottom:2em;
+	line-height:4em;
 }
 .geointInfo a
 {
 	color:lightgray;
 }
-
+.geointInfo img
+{
+	margin: 0.5em;
+	height: 3.5em;
+}
 .translucid
 {
 	opacity:0.8;

templates/registration/login.html

@@ -24,7 +24,7 @@
 		<div class="col-md-4 col-md-offset-4" style="text-align:center;">
 		</div>
 	</div>
-<div class="row translucid">
+<div class="row translucid visible-lg-block visible-md-block">
 	<div class="col-md-4">
 		<div class="panel panel-red">
 		        <div class="panel-heading">
@@ -72,7 +72,7 @@
 	</div>
 </div>
         <div class="row">
-                <div class="col-md-4 translucid">
+                <div class="col-md-4 translucid visible-lg-block visible-md-block">
 
 		<div class="row">
                 <div class="col-md-12">
@@ -165,7 +165,7 @@
 
 
 		</div>
-                <div class="col-md-4 translucid">
+                <div class="col-md-4 translucid visible-lg-block visible-md-block">
                         <div class="row">
 		                <div class="col-md-12">
                 		        <div class="panel panel-red">
@@ -210,7 +210,18 @@
 
 
 <div class="row geointInfo" >
-	<div class="col-md-12">
+        <div class="col-md-4">
+
+		
+        </div>
+
+        <div class="col-md-4 visible-lg-block visible-md-block">
+                <img src="{% static 'images/conacytLogo_white.png'%}"/>
+		<img src="{% static 'images/geologo_white.png'%}"/>
+                <img src="{% static 'images/geointLogo_white.png'%}"/>
+
+	</div>
+	<div class="col-md-4">
 		<a href="http://www.centrogeo.org.mx/">© 2018 Centro de Investigación en Ciencias de Información Geoespacial</a>
 	</div>