Merge pull request #176 from dwimsey/feature/cleanup-core-datasourcewrapper-unused

Remove unreferenced files, these were moved to the Controls library long ago

Source/Core/Python/DataSourceWrapper.cpp

@@ -1,191 +0,0 @@
-/*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
- *
- * For the latest information, see http://www.librocket.com
- *
- * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- */
-
-#include "precompiled.h"
-#include "DataSourceWrapper.h"
-#include <EMP/Core/Python/Python.h>
-#include <EMP/Core/Python/Utilities.h>
-
-namespace EMP {
-namespace Core {
-namespace Python {
-
-DataSourceWrapper::DataSourceWrapper(PyObject* _self, const char* name) : DataSource(name)
-{
-	self = _self;
-}
-
-DataSourceWrapper::~DataSourceWrapper()
-{
-}
-
-void DataSourceWrapper::InitialisePythonInterface()
-{
-	void (DataSourceWrapper::*NotifyRowChange)(const String&) = &DataSourceWrapper::NotifyRowChange;
-	void (DataSourceWrapper::*NotifyRowChangeParams)(const String&, int, int) = &DataSourceWrapper::NotifyRowChange;
-
-	python::scope datasource_scope = python::class_<DataSource, DataSourceWrapper, boost::noncopyable>("DataSource", python::init< const char* >())
-		.def("NotifyRowAdd", &DataSourceWrapper::NotifyRowAdd)
-		.def("NotifyRowRemove", &DataSourceWrapper::NotifyRowRemove)
-		.def("NotifyRowChange", NotifyRowChange)
-		.def("NotifyRowChange", NotifyRowChangeParams)		
-		;
-
-	// Register the column names for use in python
-	python::scope().attr("COLUMN_CHILD_SOURCE") = DataSource::CHILD_SOURCE;
-	python::scope().attr("COLUMN_DEPTH") = DataSource::DEPTH;
-	python::scope().attr("COLUMN_NUM_CHILDREN") = DataSource::NUM_CHILDREN;
-}
-
-void DataSourceWrapper::GetRow(StringList& row, const String& table, int row_index, const StringList& columns)
-{
-	PyObject* callable = PyObject_GetAttrString(self, "GetRow");
-	if (!callable)
-	{
-		Core::String error_message(128, "Function \"GetRow\" not found on python data source %s.", Utilities::GetPythonClassName(self).CString());
-		Log::Message(LC_COREPYTHON, Log::LT_WARNING, "%s", error_message.CString());
-		PyErr_SetString(PyExc_RuntimeError, error_message.CString());
-		python::throw_error_already_set();
-		return;
-	}
-
-	python::tuple t = python::make_tuple(table.CString(), row_index, columns);
-	PyObject* result = PyObject_CallObject(callable, t.ptr());
-	Py_DECREF(callable);	
-
-	// If it's a list, then just get the entries out of it
-	if (result && PyList_Check(result))
-	{
-		int num_entries = PyList_Size(result);
-		for (int i = 0; i < num_entries; i++)
-		{
-			Core::String entry;
-
-			PyObject* entry_object = PyList_GetItem(result, i);
-			if (PyString_Check(entry_object))
-			{
-				entry = PyString_AS_STRING(entry_object);
-			}
-			else if (PyInt_Check(entry_object))
-			{
-				int entry_int = (int)PyInt_AS_LONG(entry_object);
-				Core::TypeConverter< int, Core::String >::Convert(entry_int, entry);
-			}
-			else if (PyFloat_Check(entry_object))
-			{
-				float entry_float = (float)PyFloat_AS_DOUBLE(entry_object);
-				Core::TypeConverter< float, Core::String >::Convert(entry_float, entry);
-			}
-			else
-			{
-				Core::String error_message(128, "Failed to convert row %d entry %d on data source %s.", row_index, i, Utilities::GetPythonClassName(self).CString());
-				Log::Message(LC_COREPYTHON, Log::LT_WARNING, "%s", error_message.CString());
-				PyErr_SetString(PyExc_RuntimeError, error_message.CString());
-				python::throw_error_already_set();
-			}
-
-			row.push_back(entry);
-		}
-	}
-	else
-	{
-		// Print the error and restore it to the caller
-		PyObject *type, *value, *traceback;
-		PyErr_Fetch(&type, &value, &traceback);
-		Py_XINCREF(type);
-		Py_XINCREF(value);
-		Py_XINCREF(traceback);
-
-		Core::String error_message(128, "Failed to get entries for table %s row %d from python data source %s.", table.CString(), row_index, Utilities::GetPythonClassName(self).CString());
-		Log::Message(LC_COREPYTHON, Log::LT_WARNING, "%s", error_message.CString());
-		if (type == NULL)
-			PyErr_SetString(PyExc_RuntimeError, error_message.CString());
-		else
-			PyErr_Restore(type, value, traceback);
-
-		python::throw_error_already_set();
-	}
-
-	if (result)
-		Py_DECREF(result);
-}
-
-int DataSourceWrapper::GetNumRows(const String& table)
-{
-	int num_rows = 0;
-
-	PyObject* callable = PyObject_GetAttrString(self, "GetNumRows");
-	if (!callable)
-	{
-		Core::String error_message(128, "Function \"GetNumRows\" not found on python data source %s.", Utilities::GetPythonClassName(self).CString());
-		Log::Message(LC_COREPYTHON, Log::LT_WARNING, "%s", error_message.CString());
-		PyErr_SetString(PyExc_RuntimeError, error_message.CString());
-		python::throw_error_already_set();
-
-		return 0;
-	}
-
-	PyObject* result = PyObject_CallObject(callable, python::make_tuple(table.CString()).ptr());
-	Py_DECREF(callable);
-
-	if (result && PyInt_Check(result))
-	{
-		num_rows = PyInt_AsLong(result);
-	}
-	else
-	{
-		// Print the error and restore it to the caller
-		PyObject *type, *value, *traceback;
-		PyErr_Fetch(&type, &value, &traceback);
-		Py_XINCREF(type);
-		Py_XINCREF(value);
-		Py_XINCREF(traceback);
-
-		Core::String error_message(128, "Failed to get number of rows from python data source %s.", Utilities::GetPythonClassName(self).CString());
-		Log::Message(LC_COREPYTHON, Log::LT_WARNING, "%s", error_message.CString());
-		if (type == NULL)
-			PyErr_SetString(PyExc_RuntimeError, error_message.CString());
-		else
-			PyErr_Restore(type, value, traceback);
-
-		python::throw_error_already_set();
-	}
-	
-	if (result)
-		Py_DECREF(result);
-
-	return num_rows;	
-}
-
-ScriptObject DataSourceWrapper::GetScriptObject() const
-{
-	return self;
-}
-
-}
-}
-}

Source/Core/Python/DataSourceWrapper.h

@@ -1,68 +0,0 @@
-/*
- * This source file is part of libRocket, the HTML/CSS Interface Middleware
- *
- * For the latest information, see http://www.librocket.com
- *
- * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- */
-
-#ifndef EMPCOREPYTHONDATASOURCEWRAPPER_H
-#define EMPCOREPYTHONDATASOURCEWRAPPER_H
-
-#include <EMP/Core/Python/Python.h>
-#include <EMP/Core/Types.h>
-#include <EMP/Core/DataSource.h>
-
-namespace EMP {
-namespace Core {
-namespace Python {
-
-/**
-	Python DataSource Wrapper
-
-	Exposes a DataSource to python.
-
-	@author Lloyd Weehuizen
- */
-
-class DataSourceWrapper : public DataSource
-{
-	public:
-		DataSourceWrapper(PyObject* self, const char* name);
-		~DataSourceWrapper();
-
-		static void InitialisePythonInterface();
-
-		void GetRow(StringList& row, const String& table, int row_index, const StringList& columns);
-		int GetNumRows(const String& table);
-
-		virtual ScriptObject GetScriptObject() const;
-
-	private:
-		PyObject* self;
-};
-
-}
-}
-}
-
-#endif