11 Commits

Author SHA1 Message Date
f2939feeda Add dates and mailing list names to search results 2018-08-24 09:36:31 -07:00
1985e6606c Merge pull request #95 from dcppc/fix-output-msg
change "documents" to "issues" in reindexing message
2018-08-24 09:25:09 -07:00
1b2f9a2278 fix output messages for reindexing 2018-08-24 09:23:09 -07:00
d7d929689b Merge pull request #94 from dcppc/raynamharris-patch-1
Create ISSUE_TEMPLATE.md
2018-08-24 09:20:46 -07:00
937708f5d8 do *full* indexing 2018-08-24 09:01:18 -07:00
Rayna M Harris
d2dff2217a fixed typo 2018-08-24 10:44:45 -05:00
4c3ee712bb Fix display bug. Merge branch 'dcppc' of github.com:dcppc/centillion into dcppc
* 'dcppc' of github.com:dcppc/centillion:
  fix styles
2018-08-24 08:42:03 -07:00
f5af965a33 fix display bug 2018-08-24 08:41:35 -07:00
bce16d336d fix flask example configuration 2018-08-24 08:40:46 -07:00
Rayna M Harris
9b2ce7b3ca Create ISSUE_TEMPLATE.md 2018-08-24 10:40:29 -05:00
729514ac89 Merge pull request #93 from dcppc/fix-styles
fix styles
2018-08-24 08:37:51 -07:00
6 changed files with 82 additions and 18 deletions

17
.github/ISSUE_TEMPLATE.md vendored Normal file
View File

@@ -0,0 +1,17 @@
Thanks for using Centillion. Your feedback is important to us.
### When reporting a bug, please be sure to include the following:
- [ ] A descriptive title
- [ ] The behavior you expect to see and the actual behavior observed
- [ ] Steps to reproduce the behavior
- [ ] What browser you are using
### When you open an issue for a feature request, please add as much detail as possible:
- [ ] A descriptive title
- [ ] A description of the problem you're trying to solve, including *why* you think this is a problem
- [ ] An overview of the suggested solution
- [ ] If the feature changes current behavior, please explain why your solution is better
See read [our contributor guidelines](https://github.com/dcppc/centillion/blob/dcppc/CONTRIBUTING.md)
for more details about contributing to this project.

View File

@@ -744,10 +744,10 @@ class Search:
full_items[f['id']] = f
## Shorter:
break
#break
## Longer:
#if nextPageToken is None:
# break
if nextPageToken is None:
break
writer = self.ix.writer()
@@ -795,7 +795,7 @@ class Search:
subprocess.call(['rm','-fr',temp_dir])
writer.commit()
print("Done, updated %d documents in the index" % count)
print("Done, updated %d Google Drive files in the index" % count)
# ------------------------------
@@ -873,7 +873,7 @@ class Search:
writer.commit()
print("Done, updated %d documents in the index" % count)
print("Done, updated %d Github issues in the index" % count)
@@ -1165,9 +1165,9 @@ class Search:
sr.id = r['id']
sr.kind = r['kind']
sr.created_time = r['created_time']
sr.modified_time = r['modified_time']
sr.indexed_time = r['indexed_time']
sr.created_time = datetime.strftime(r['created_time'], "%Y-%m-%d %I:%M %p")
sr.modified_time = datetime.strftime(r['modified_time'], "%Y-%m-%d %I:%M %p")
sr.indexed_time = datetime.strftime(r['indexed_time'], "%Y-%m-%d %I:%M %p")
sr.title = r['title']
sr.url = r['url']
@@ -1177,6 +1177,8 @@ class Search:
sr.owner_email = r['owner_email']
sr.owner_name = r['owner_name']
sr.group = r['group']
sr.repo_name = r['repo_name']
sr.repo_url = r['repo_url']

View File

@@ -1,20 +1,38 @@
######################################
# github oauth
GITHUB_OAUTH_CLIENT_ID = "XXX"
GITHUB_OAUTH_CLIENT_SECRET = "YYY"
######################################
# github acces token
GITHUB_TOKEN = "XXX"
######################################
# groups.io
GROUPSIO_TOKEN = "XXXXX"
GROUPSIO_USERNAME = "XXXXX"
GROUPSIO_PASSWORD = "XXXXX"
######################################
# Disqus API public key
DISQUS_TOKEN = "XXXXX"
######################################
# everything else
# Location of index file
INDEX_DIR = "search_index"
# oauth client deets
GITHUB_OAUTH_CLIENT_ID = "XXX"
GITHUB_OAUTH_CLIENT_SECRET = "YYY"
GITHUB_TOKEN = "ZZZ"
# More information footer: Repository label
FOOTER_REPO_ORG = "charlesreid1"
FOOTER_REPO_ORG = "dcppc"
FOOTER_REPO_NAME = "centillion"
# Toggle to show Whoosh parsed query
SHOW_PARSED_QUERY=True
TAGLINE = "Search All The Things"
TAGLINE = "Search the Data Commons"
# Flask settings
DEBUG = True
SECRET_KEY = 'WWWWW'
SECRET_KEY = 'XXXXX'

View File

@@ -66,7 +66,7 @@ class GroupsIOArchivesCrawler(object):
## Short circuit
## for debugging purposes
break
#break
return subgroups

View File

@@ -58,7 +58,7 @@ button#feedback {
/* search results table */
td#search-results-score-col,
td#search-results-type-col {
width: 100px;
width: 90px;
}
div.container {

View File

@@ -165,10 +165,18 @@
<a href='{{e.url}}'>{{e.title}}</a>
(Owner: {{e.owner_name}}, {{e.owner_email}})<br />
<b>Document Type</b>: {{e.mimetype}}
{% if e.created_time %}
<br/>
<b>Created:</b> {{e.created_time}}
{% endif %}
{% else %}
<b>Google Drive File:</b>
<a href='{{e.url}}'>{{e.title}}</a><br />
<b>Owner:</b> {{e.owner_name}}, {{e.owner_email}}<br />
{% if e.created_time %}
<br/>
<b>Created:</b> {{e.created_time}}
{% endif %}
{% endif %}
{% elif e.kind=="issue" %}
@@ -179,6 +187,10 @@
{% endif %}
<br/>
<b>Repository:</b> <a href='{{e.repo_url}}'>{{e.repo_name}}</a>
{% if e.created_time %}
<br/>
<b>Date:</b> {{e.created_time}}
{% endif %}
{% elif e.kind=="ghfile" %}
<b>Github File:</b>
@@ -197,6 +209,21 @@
<a href='{{e.url}}'>{{e.title}}</a>
<br/>
<b>Started By:</b> {{e.owner_name}}
<br/>
<b>Mailing List:</b> {{e.group}}
{% if e.created_time %}
<br/>
<b>Date:</b> {{e.created_time}}
{% endif %}
{% elif e.kind=="disqus" %}
<b>Disqus Comment Thread:</b>
<a href='{{e.url}}'>{{e.title}}</a>
<br/>
{% if e.created_time %}
<br/>
<b>Date:</b> {{e.created_time}}
{% endif %}
{% else %}
<b>Item:</b> (<a href='{{e.url}}'>link</a>)