Commit 0564d9d6 authored by Franziska Koehn's avatar Franziska Koehn
Browse files

package xsalogic and package xsa merged

parent 9361df56
......@@ -63,7 +63,7 @@ class QueryController(gobject.GObject):
def on_search_query(host, credentials, root_type, query, fields):
user, passw = credentials
import xsalogic.queries as queries
import xsa.queries as queries
import xsa.errors as xsa_errors
try:
......@@ -101,7 +101,7 @@ class QueryController(gobject.GObject):
self.query=self.queryview.get_query()
self.labels=self.queryview.get_fields()
import xsalogic.datatypereader as type_reader
import xsa.datatypereader as type_reader
fields = type_reader.get_fields_from_labels(self.labels,self.root)
on_search_query(self.host, self.credentials_tuple,
self.root,
......@@ -183,8 +183,8 @@ class QueryController(gobject.GObject):
if self.resultsview.get_selected_items() == []:
return
import xsalogic.queries as queries
import xsalogic.datatypereader as type_reader
import xsa.queries as queries
import xsa.datatypereader as type_reader
dialog = gtk.FileChooserDialog( "Open..",
None,
......
import xsalogic.queries as queries
import xsa.queries as queries
def main(host, user, passw):
import distutils.core
......
......@@ -5,7 +5,7 @@ class ChartView(gtk.HPaned):
results = []
def create_new_chart(self, field, allocation):
import xsalogic.chart as chart
import xsa.chart as chart
import tempfile
substrings = []
strings = []
......@@ -110,7 +110,7 @@ class ComboBoxRootType(gtk.ComboBox):
return None
def show_data(self, root_type, data):
import xsalogic.datatypereader as type_reader
import xsa.datatypereader as type_reader
self.store.clear()
if data == []:
return
......
......@@ -22,7 +22,7 @@ class QueryView(gtk.VBox):
hBox_root_type.pack_start(label_root_type, False, True, 0)
def changed_cb(combobox):
import xsalogic.datatypereader as type_reader
import xsa.datatypereader as type_reader
import xsa.errors as xsa_errors
selected = combobox.get_active_text()
try:
......@@ -37,7 +37,7 @@ class QueryView(gtk.VBox):
self.combobox = gtk.combo_box_new_text()
import xsalogic.datatypereader as type_reader
import xsa.datatypereader as type_reader
for t in type_reader.get_data_types():
self.combobox.append_text(t)
......@@ -121,7 +121,7 @@ class TreeViewResultFields(gtk.TreeView):
self.append_column(column)
def show_fields(self, root_type):
import xsalogic.datatypereader as type_reader
import xsa.datatypereader as type_reader
self.store.clear()
fields = type_reader.get_fields_required(root_type)
for f in fields:
......@@ -311,20 +311,20 @@ class TreeViewQuery(gtk.TreeView):
self.store.append(None, (self.inital_value, '', '', False, self.tooltip))
def create_type_list(self):
import xsalogic.datatypereader as type_reader
import xsa.datatypereader as type_reader
self.types = type_reader.get_labels(self.root_type)
def create_method_list(self):
import xsalogic.queries as queries
import xsa.queries as queries
self.methods = queries.get_query_methods()
def create_operator_list(self):
import xsalogic.queries as queries
import xsa.queries as queries
self.operators = queries.get_operators()
def set_query(self, root_type, query):
import xsa.errors as xsa_errors
import xsalogic.datatypereader as type_reader
import xsa.datatypereader as type_reader
search_fields = type_reader.get_fields(root_type)
def add_next_to_store(values, parent):
......@@ -351,7 +351,7 @@ class TreeViewQuery(gtk.TreeView):
def get_query(self, type):
import xsalogic.datatypereader as type_reader
import xsa.datatypereader as type_reader
search_fields = type_reader.get_fields(type)
def add_next_to_query(iter, list):
......
......@@ -131,7 +131,7 @@ class TreeViewResults(gtk.TreeView):
self.store.append(result)
import xsalogic.datatypereader as type_reader
import xsa.datatypereader as type_reader
keys_ = list(type_reader.get_field_label(root_type, key) for key in keys)
self.create_columns(keys_)
self.set_model(self.store)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment