November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r42026 - in /trunk/core/libycp/src: YCPBuiltinFloat.cc YCPFloat.cc
by mvidner＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: mvidner Date: Tue Nov 13 16:00:34 2007 New Revision: 42026 URL: http://svn.opensuse.org/viewcvs/yast?rev=42026&view=rev Log: fixed some warnings Modified: trunk/core/libycp/src/YCPBuiltinFloat.cc trunk/core/libycp/src/YCPFloat.cc Modified: trunk/core/libycp/src/YCPBuiltinFloat.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinFloat.… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinFloat.cc (original) +++ trunk/core/libycp/src/YCPBuiltinFloat.cc Tue Nov 13 16:00:34 2007 @@ -150,7 +150,8 @@ char *buffer; - asprintf (&buffer, "%.*f", int (precision->value ()), f->value ()); + if (asprintf (&buffer, "%.*f", int (precision->value ()), f->value ()) == -1) + return YCPNull (); // malloc error YCPValue ret = YCPString (buffer); free (buffer); return ret; Modified: trunk/core/libycp/src/YCPFloat.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPFloat.cc?rev=… ============================================================================== --- trunk/core/libycp/src/YCPFloat.cc (original) +++ trunk/core/libycp/src/YCPFloat.cc Tue Nov 13 16:00:34 2007 @@ -39,13 +39,13 @@ // first try HEX and OCT --> "-0x000b", "-000010", ... v = (double) strtol(r, &endptr, 0); - if ( *endptr == '.' && isdigit(*(endptr+1)) || - *endptr == 'e' && isdigit(*(endptr+1)) || - *endptr == 'e' && *(endptr+1) == '-' && isdigit(*(endptr+2)) || - *endptr == 'e' && *(endptr+1) == '+' && isdigit(*(endptr+2)) || - *endptr == 'E' && isdigit(*(endptr+1)) || - *endptr == 'E' && *(endptr+1) == '-' && isdigit(*(endptr+2)) || - *endptr == 'E' && *(endptr+1) == '+' && isdigit(*(endptr+2)) ) // real float + if ((*endptr == '.' && isdigit(*(endptr+1)) )|| + (*endptr == 'e' && isdigit(*(endptr+1)) )|| + (*endptr == 'e' && *(endptr+1) == '-' && isdigit(*(endptr+2)))|| + (*endptr == 'e' && *(endptr+1) == '+' && isdigit(*(endptr+2)))|| + (*endptr == 'E' && isdigit(*(endptr+1)) )|| + (*endptr == 'E' && *(endptr+1) == '-' && isdigit(*(endptr+2)))|| + (*endptr == 'E' && *(endptr+1) == '+' && isdigit(*(endptr+2))) ) // real float { v = atof(r); // use default } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42025 - /trunk/core/autodocs/Makefile.am
by mvidner＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: mvidner Date: Tue Nov 13 16:00:03 2007 New Revision: 42025 URL: http://svn.opensuse.org/viewcvs/yast?rev=42025&view=rev Log: don't reference liby2util.tag, the autodocs moved here Modified: trunk/core/autodocs/Makefile.am Modified: trunk/core/autodocs/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/autodocs/Makefile.am?rev=42… ============================================================================== --- trunk/core/autodocs/Makefile.am (original) +++ trunk/core/autodocs/Makefile.am Tue Nov 13 16:00:03 2007 @@ -13,9 +13,5 @@ index.html: $(wildcard $(top_srcdir)/*/*.cc $(top_srcdir)/*/*/*.cc) ${YDOXYGEN} PROJECT_NAME=@RPMNAME@ \ - INPUT=.. \ - "TAGFILES=\ - \"$(DOC)/liby2util/autodocs/liby2util.tag = \ - $(DOC)/liby2util/autodocs\" \ - " + INPUT=.. # TODO: create libzypp.tag and use it (elsewhere) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42024 - in /branches/tmp/sh/mod-ui/qt/src/pkg: YQPkgConflictDialog.cc YQPkgConflictDialog.h
by tgoettlicher＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: tgoettlicher Date: Tue Nov 13 15:49:24 2007 New Revision: 42024 URL: http://svn.opensuse.org/viewcvs/yast?rev=42024&view=rev Log: Added event handler for screen shots to YQPkgConflictDiaglog (#310425) Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgConflictDialog.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgConflictDialog.h Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgConflictDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPk… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgConflictDialog.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgConflictDialog.cc Tue Nov 13 15:49:24 2007 @@ -396,6 +396,16 @@ } } +void +YQPkgConflictDialog::keyPressEvent( QKeyEvent * event ) +{ + if ( event && event->key() == Qt::Key_Print ) + { + YQUI::ui()->makeScreenShot( "" ); + return; + } + QWidget::keyPressEvent( event ); +} Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgConflictDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPk… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgConflictDialog.h (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgConflictDialog.h Tue Nov 13 15:49:24 2007 @@ -134,6 +134,16 @@ **/ int processSolverResult( bool success ); + /** + * Event handler for keyboard input. + * Only very special keys are processed here. + * + * Inherited from QWidget. + **/ + void keyPressEvent( QKeyEvent * e ); + + + // // Data members // -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42023 - in /branches/tmp/sh/mod-ui/web-wt/src: Makefile.am YWebPushButton.cc YWebUI.h YWebUI_core.cc
by visnov＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: visnov Date: Tue Nov 13 15:34:07 2007 New Revision: 42023 URL: http://svn.opensuse.org/viewcvs/yast?rev=42023&view=rev Log: added WTimer to evaluate the UI calls in the correct thread, does not work so far Modified: branches/tmp/sh/mod-ui/web-wt/src/Makefile.am branches/tmp/sh/mod-ui/web-wt/src/YWebPushButton.cc branches/tmp/sh/mod-ui/web-wt/src/YWebUI.h branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc Modified: branches/tmp/sh/mod-ui/web-wt/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/Make… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/Makefile.am (original) +++ branches/tmp/sh/mod-ui/web-wt/src/Makefile.am Tue Nov 13 15:34:07 2007 @@ -23,6 +23,7 @@ libpy2web_la_SOURCES = \ Y2CCWeb.cc \ \ + YWebUIComponent.cc \ YWebUI_core.cc \ YWebUI_widgets.cc \ YWebUI_builtins.cc \ Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/YWeb… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/YWebPushButton.cc (original) +++ branches/tmp/sh/mod-ui/web-wt/src/YWebPushButton.cc Tue Nov 13 15:34:07 2007 @@ -20,15 +20,40 @@ #define y2log_component "web-ui" #include <ycp/y2log.h> +#include <sys/types.h> + #include "YWebPushButton.h" +#include <WPushButton> +#include <WApplication> using std::string; +using namespace Wt; + +#include <unistd.h> +#include <sys/syscall.h> +#include <sys/types.h> +pid_t gettid() +{ + pid_t tid; + tid = syscall(SYS_gettid); + return tid; +} + + +// HACK +extern WApplication* _wApp; YWebPushButton::YWebPushButton( YWidget * parent, const string & label ) : YPushButton( parent, label ) { + if( ! widgetRep() ) { + + y2security( "Using application %p, tid %d", _wApp, gettid()); + setWidgetRep( new WPushButton(label, _wApp->root() ) ); + y2milestone( "Pushbutton %s created", label.c_str()); + } } Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/YWeb… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/YWebUI.h (original) +++ branches/tmp/sh/mod-ui/web-wt/src/YWebUI.h Tue Nov 13 15:34:07 2007 @@ -24,6 +24,7 @@ #include <YUI.h> #include <WApplication> +#include <WTimer> #include <WEnvironment> class YEvent; @@ -394,6 +395,14 @@ YSimpleEventHandler _event_handler; public: + void createTimer() ; + + void triggeredTimer(); + + Wt::WTimer* _timer; + + bool _wtimer_work; + static int _argc; static char** _argv; }; Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/YWeb… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc (original) +++ branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc Tue Nov 13 15:34:07 2007 @@ -23,6 +23,8 @@ #include <ycp/YCPTerm.h> #include <ycp/YCPCode.h> +#include <yui/Y2UINamespace.h> + #define y2log_component "web-ui" #include <ycp/y2log.h> @@ -38,7 +40,9 @@ YWebUI * YWebUI::_ui = 0; int YWebUI::_argc = 0; -char ** YWebUI::_argv = 0L; +char ** YWebUI::_argv = 0; + +WApplication* _wApp = 0; YWebUI::YWebUI( const Wt::WEnvironment& env, const char * macro_file ) : WApplication(env), @@ -49,6 +53,7 @@ _ui = this; _fatal_error = false; + _builtinCallData.function = 0; // processCommandLineArgs( argc, argv ); topmostConstructorHasFinished(); @@ -118,8 +123,37 @@ void YWebUI::idleLoop( int fd_ycp ) { - // FIXME - _leave_idle_loop = true; + while ( true ) + { + sleep(1); // idleLoop ( pipe_to_ui[0] ); + + // The pipe is non-blocking, so we have to check if we really read a + // signal byte. Although idleLoop already makes a select, this seems to + // be necessary. Anyway: Why do we set the pipe to non-blocking if we + // wait in idleLoop for it to become readable? It is needed in + // YUIQt::idleLoop for QSocketNotifier. + + y2milestone( "Waiting for work from YCP" ); + + if ( ! waitForYCPThread () ) + continue; + + if ( terminate_ui_thread ) + return; + + _wtimer_work = true; + + y2security( "%s", _builtinCallData.function->name().c_str()); + + while( _wtimer_work ) + { + sleep(1); + } + // _builtinCallData.result = _builtinCallData.function->evaluateCall_int(); + + signalYCPThread(); + } + } @@ -234,12 +268,18 @@ // FIXME } +extern pid_t gettid(); WApplication *createApplication(const WEnvironment& env) { // Instantiate the Wt application. YWebUI *appl = new YWebUI( env, 0 ); + // HACK!!!! - not a singleton + _wApp = appl; + + y2security( "Application: %p, thread %d", _wApp, gettid()); + // Set window title std::string title( "YaST2" ); @@ -266,13 +306,9 @@ // Set application title appl->setTitle(title); -#if 0 // Set up a timer for handling YaST requests appl->createTimer(); - _wtimer_work = true; -#endif - return appl; } @@ -285,3 +321,35 @@ return 0; } + +void YWebUI::createTimer() +{ + _timer = new WTimer(); + _timer->setInterval( 1000 ); // 1 sec + + _timer->timeout.connect( SLOT(this, YWebUI::triggeredTimer ) ); + + _timer->start(); +} + +void YWebUI::triggeredTimer() +{ + y2debug ("Timer triggered"); + if( _wtimer_work && _builtinCallData.function ) + { + + y2milestone("Work to do in %p, function '%s'", this, _builtinCallData.function->name().c_str()); + + // callFunction() checks for NULL function pointers + // (dynamic_cast<WTimer*>(WObject::sender()))->stop (); + + _builtinCallData.result = _builtinCallData.function->evaluateCall_int(); + + _builtinCallData.function = 0; + + _wtimer_work = false; + + signalYCPThread(); + } +} + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42022 - in /trunk/core: configure.in.in liby2/src/Y2SerialComponent.cc yast2-core.spec.in
by mvidner＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: mvidner Date: Tue Nov 13 15:31:06 2007 New Revision: 42022 URL: http://svn.opensuse.org/viewcvs/yast?rev=42022&view=rev Log: replaced term.h by termios.h, which removes the ncurses-devel dependency. yeah! Modified: trunk/core/configure.in.in trunk/core/liby2/src/Y2SerialComponent.cc trunk/core/yast2-core.spec.in Modified: trunk/core/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/configure.in.in?rev=42022&r… ============================================================================== --- trunk/core/configure.in.in (original) +++ trunk/core/configure.in.in Tue Nov 13 15:31:06 2007 @@ -18,13 +18,8 @@ AC_MSG_ERROR([bison not installed]) fi -# liby2:Y2SerialComponent needs term.h -> ncurses, ncurses-devel -yast_found_ncurses=no -AC_CHECK_HEADER(term.h,[yast_found_ncurses=yes]) -if [[ "$yast_found_ncurses" = "no" ]]; then - AC_MSG_ERROR(Headers for ncurses are missing. Please install the package ncurses-devel.) -fi - +# liby2:Y2SerialComponent needs termios.h in glibc-devel +# (not term.h in ncurses-devel) # libycp: y2crypt needs xcrypt.h -> libxcrypt, libxcrypt-devel yast_found_xcrypt=no Modified: trunk/core/liby2/src/Y2SerialComponent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2/src/Y2SerialComponent… ============================================================================== --- trunk/core/liby2/src/Y2SerialComponent.cc (original) +++ trunk/core/liby2/src/Y2SerialComponent.cc Tue Nov 13 15:31:06 2007 @@ -29,7 +29,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <term.h> +#include <termios.h> #include <linux/types.h> #include <linux/serial.h> #include <sys/time.h> // timeval Modified: trunk/core/yast2-core.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/yast2-core.spec.in?rev=4202… ============================================================================== --- trunk/core/yast2-core.spec.in (original) +++ trunk/core/yast2-core.spec.in Tue Nov 13 15:31:06 2007 @@ -22,8 +22,6 @@ BuildRequires: blocxx-devel # libycp includes crypto built-ins BuildRequires: libxcrypt-devel -# liby2:Y2SerialComponent needs term.h -BuildRequires: ncurses-devel Summary: - # ag_hostnames: .net.hostnames (#264309) @@ -67,7 +65,7 @@ Obsoletes: yast2-core-translator-devel Provides: yast2-core-scr-soho-devel Obsoletes: yast2-core-scr-soho-devel -Requires: libxcrypt-devel hwinfo-devel ncurses-devel +Requires: libxcrypt-devel hwinfo-devel Requires: glibc-devel libstdc++-devel pcre-devel blocxx-devel sysfsutils # for FlexLexer.h; I think that this dependency could be made # private but it seems not worth the effort -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42021 - in /trunk/python-bindings/src: YCPDeclarations.cc YCPDeclarations.h YPython.cc YPython.h YPythonNamespace.cc YPythonNamespace.h
by juhliarik＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: juhliarik Date: Tue Nov 13 15:13:53 2007 New Revision: 42021 URL: http://svn.opensuse.org/viewcvs/yast?rev=42021&view=rev Log: added functionality for calling python function in YCP via reference Modified: trunk/python-bindings/src/YCPDeclarations.cc trunk/python-bindings/src/YCPDeclarations.h trunk/python-bindings/src/YPython.cc trunk/python-bindings/src/YPython.h trunk/python-bindings/src/YPythonNamespace.cc trunk/python-bindings/src/YPythonNamespace.h Modified: trunk/python-bindings/src/YCPDeclarations.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPDeclarati… ============================================================================== --- trunk/python-bindings/src/YCPDeclarations.cc (original) +++ trunk/python-bindings/src/YCPDeclarations.cc Tue Nov 13 15:13:53 2007 @@ -2,21 +2,27 @@ #include <iostream> using std::string; using std::vector; -#define DBG(str) \ - std::cerr << __FILE__ << ": " << __LINE__ << ": " << str << std::endl; \ - std::cerr.flush() -//#define DBG(str) +//#define DBG(str) \ +// std::cerr << __FILE__ << ": " << __LINE__ << ": " << str << std::endl; \ +// std::cerr.flush() +#define DBG(str) /********** STATIC MEMBERS **********/ +int YCPDeclarations::_initial = 0; + std::auto_ptr<YCPDeclarations> YCPDeclarations::_instance; YCPDeclarations *YCPDeclarations::instance() { + + DBG("Called YCPDeclarations::instance()"); if (_instance.get() == 0){ _instance = std::auto_ptr<YCPDeclarations>(new YCPDeclarations()); } return _instance.get(); } + + /********** STATIC MEMBERS END **********/ @@ -164,6 +170,7 @@ YCPDeclarations::YCPDeclarations() { DBG("YCPDeclarations - constructor"); + YCPDeclarations::_initial = 1; _py_self = PyImport_ImportModule("YCPDeclarations"); if (_py_self == NULL){ DBG("YCPDeclarations::YCPDeclarations() - Failed to import YCPDeclarations module!"); @@ -174,19 +181,26 @@ { DBG("YCPDeclarations - destructor"); - - int cache_len = _cache.size(); - for (int i=0; i < cache_len; i++){ - delete _cache[i]; - } - - if (_py_self != NULL) - Py_DECREF(_py_self); - - //_instance = std::auto_ptr<YCPDeclarations>(NULL); + if (Initialized()) { + int cache_len = _cache.size(); + for (int i=0; i < cache_len; i++){ + delete _cache[i]; + } + + if (_py_self != NULL) + Py_DECREF(_py_self); + } + YCPDeclarations::_initial = 0; } +bool YCPDeclarations::Initialized() { + if (YCPDeclarations::_initial == 1) + return true; + else + return false; +} + int YCPDeclarations::numParams(PyFunctionObject *func) { Modified: trunk/python-bindings/src/YCPDeclarations.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPDeclarati… ============================================================================== --- trunk/python-bindings/src/YCPDeclarations.h (original) +++ trunk/python-bindings/src/YCPDeclarations.h Tue Nov 13 15:13:53 2007 @@ -85,10 +85,22 @@ */ const cache_function_t *_getCachedFunction(PyFunctionObject *func) const; + + /** + * The value indicates if YCPDeclarations was initialized + * 1 - initialized 0 - non initialized + */ + static int _initial; + public: ~YCPDeclarations(); /** + * Return true if YCPDeclarations was initialized. + */ + bool Initialized(); + + /** * Return number of parameters in declaration or -1 if function is not registered. */ int numParams(PyFunctionObject *pointer_to_function); Modified: trunk/python-bindings/src/YPython.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPython.cc?r… ============================================================================== --- trunk/python-bindings/src/YPython.cc (original) +++ trunk/python-bindings/src/YPython.cc Tue Nov 13 15:13:53 2007 @@ -46,9 +46,11 @@ #include <ycp/YCPVoid.h> #include <ycp/YCPCode.h> #include <ycp/YCPExternal.h> +#include <ycp/Point.h> #include "YCPTypes.h" #include "YPythonNamespace.h" +#include "YCPDeclarations.h" #include <iostream> #define DBG(str) \ @@ -134,7 +136,8 @@ if (!Py_IsInitialized()) { setenv("PYTHONPATH", path.c_str(), 1); Py_Initialize(); - YPython::_pMainDicts = PyDict_New(); + if (!YPython::_pMainDicts) + YPython::_pMainDicts = PyDict_New(); } if (!YPython::_pMainDicts) @@ -610,11 +613,11 @@ * @return namespace of YCP */ -static Y2Namespace * getNs (const char * ns_name, const char * func_name) { +static Y2Namespace * getNs (const char * ns_name) { Import import(ns_name); // has a static cache Y2Namespace *ns = import.nameSpace(); if (ns == NULL) { - y2error ("... for a Python call of %s", func_name); + y2error ("... for a Python call of %s", ns_name); } else { ns->initialize (); } @@ -632,40 +635,115 @@ int YPython::findModuleFuncInDict(string module, string function) { - PyObject* pMainDict = NULL; // dictionary of module - PyObject* pFunc = NULL; // function from dictionary + PyObject * pModuleName = PyString_FromString(module.c_str()); + if (_pMainDicts==NULL) + return -1; + if (PyDict_Contains(_pMainDicts, pModuleName)) { - //obtain correct dictionary for module - pMainDict = PyDict_GetItemString(YPython::yPython()->pMainDicts(),module.c_str()); + PyObject * pMainDict = PyDict_GetItemString(_pMainDicts, module.c_str()); + if (PyDict_Contains(pMainDict, PyString_FromString(function.c_str()))) + return 1; + else + return 0; + + } else { - //obtain function from dictionary - if (pMainDict) - pFunc = PyDict_GetItemString(pMainDict, function.c_str()); - else return -1; - - if (pFunc) - return 1; - else - return 0; + } + } +/** + * Adding module name and function into + * global dictionary + * (necessary for calling python function via reference) + **/ +bool YPython::addModuleAndFunction(string module, string fun_name, PyObject* function) { + + + PyObject * pModuleName = PyString_FromString(module.c_str()); + //check if dictionary contain "dictionary" for module + + if (_pMainDicts==NULL) { + _pMainDicts = PyDict_New(); + } + + if (PyDict_Contains(_pMainDicts, pModuleName)) { + PyObject * pMainDict = PyDict_GetItemString(_pMainDicts, module.c_str()); + + if (PyDict_Contains(pMainDict, PyString_FromString(fun_name.c_str()))) { + return true; + + } else { + //PyObject * newDict = PyDict_New(); + if (PyDict_SetItemString(pMainDict, fun_name.c_str(), function) < 0) { + y2error("Adding new function %s to local dictionary", fun_name.c_str()); + return false; + } + + if (PyDict_DelItemString(_pMainDicts, module.c_str()) <0) { + y2error("Deleting local dictionary %s from global dictionary failed", module.c_str()); + return false; + } + + if (PyDict_SetItemString(_pMainDicts, module.c_str(), pMainDict) <0) { + y2error("Adding new local dictionary %s to global dictionary", module.c_str()); + return false; + } + + return true; + } + } else { + PyObject * newDict = PyDict_New(); + + if (PyDict_SetItemString(newDict, fun_name.c_str(), function) < 0) { + y2error("Adding new function %s to local dictionary", fun_name.c_str()); + return false; + } + + if (PyDict_SetItemString(_pMainDicts, module.c_str(), newDict) <0) { + y2error("Adding new local dictionary %s to global dictionary", module.c_str()); + return false; + } + + return true; + } +} + +YCPValue YPython::findSymbolEntry(Y2Namespace *ns, string module, string function) { + + if (ns) { + TableEntry *sym_te = ns->table ()->find (function.c_str()); + + if (sym_te == NULL) { + y2error ("No such symbol %s::%s", module.c_str(), function.c_str()); + return YCPNull(); + } + + SymbolEntryPtr sym_entry = sym_te->sentry(); + //cout << "entry" << sym_entry->toString()<< endl; + return YCPReference(sym_entry); + + } else { + y2error("Creating/Importing namespace for function %s failed", function.c_str()); + return YCPNull(); + } +} /** * Convert Python Function to YCPCode. * * @param pointer to python function - * @return YCPCode - Referecne + * @return YCPReference - Referecne **/ YCPValue YPython::fromPythonFunToReference (PyObject* pyFun) { - PyObject *fun_code = PyFunction_GetCode(pyFun); string fun_name = PyString_AsString(((PyCodeObject *) fun_code)->co_name); string file_path = PyString_AsString(((PyCodeObject *) fun_code)->co_filename); - - + //int no_args = ((PyCodeObject *) fun_code)->co_argcount; + //found last "/" in path size_t found = file_path.find_last_of("/"); //extract module name from path @@ -674,25 +752,49 @@ module_name.erase(module_name.size()-3); int find = findModuleFuncInDict(module_name, fun_name); - - if (find) { - Y2Namespace *ns = getNs (module_name.c_str(),fun_name.c_str()); - - if (ns) { - TableEntry *sym_te = ns->table ()->find (fun_name.c_str()); - if (sym_te == NULL) { - y2error ("No such symbol %s::%s", module_name.c_str(), fun_name.c_str()); - return YCPNull(); + + FunctionTypePtr sym_tp; + Y2Namespace *ns; + + //namespace exist and includes function + if (find == 1) { + ns = getNs (module_name.c_str()); + + return findSymbolEntry(ns, module_name, fun_name); + + //namespace exist but doesn't include function + } else if (find ==0) { + addModuleAndFunction(module_name, fun_name, pyFun); + + ns = getNs (module_name.c_str()); + + if (ns) { + + SymbolEntry *result = ((YPythonNamespace *)ns)->AddFunction(pyFun); + if (result) + return YCPReference(result); + else { + y2error("Adding function %s to namespace %s failed", fun_name.c_str(), module_name.c_str()); + return YCPNull(); + } + + } else { + y2error("Importing namespace %s for function %s failed", + module_name.c_str(), fun_name.c_str()); + return YCPNull(); } - SymbolEntryPtr sym_entry = sym_te->sentry(); - //cout << "entry" << sym_entry->toString()<< endl; - return YCPReference(sym_entry); + //namespace and function don't exist } else { - y2error("Creating namespace for function %s failed", fun_name.c_str()); - return YCPNull(); - } + addModuleAndFunction(module_name, fun_name, pyFun); + ns = new YPythonNamespace(module_name, pyFun); + + //register new namespace + Import import(module_name, ns); + + return findSymbolEntry(ns, module_name, fun_name); + } return YCPNull(); @@ -707,9 +809,9 @@ YCPValue YPythonCode::evaluate(bool cse) { - PyObject * pReturn; + PyObject * pReturn = NULL; YCPValue result = YCPVoid(); - PyObject * pFunction; + PyObject * pFunction = NULL; PyObject * pArgs = NULL; int args_size; Modified: trunk/python-bindings/src/YPython.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPython.h?re… ============================================================================== --- trunk/python-bindings/src/YPython.h (original) +++ trunk/python-bindings/src/YPython.h Tue Nov 13 15:13:53 2007 @@ -127,6 +127,14 @@ int findModuleFuncInDict(string module, string function); + /** + * Adding module name and function into + * global dictionary + * (necessary for calling python function via reference) + **/ + bool addModuleAndFunction(string module, string fun_name, PyObject* function); + + /** * Convert a Python list to a YCPList. **/ @@ -168,8 +176,17 @@ **/ PyObject* fromYCPTermToPythonTerm (YCPValue ycp_Term); + /** + * Prepare YCPReference for calling python function in YCP via reference + **/ YCPValue fromPythonFunToReference (PyObject* pyFun); + + /** + * Function find in namespace function and return symbol entry + **/ + YCPValue findSymbolEntry(Y2Namespace *ns, string module, string function); + protected: /** Modified: trunk/python-bindings/src/YPythonNamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPythonNames… ============================================================================== --- trunk/python-bindings/src/YPythonNamespace.cc (original) +++ trunk/python-bindings/src/YPythonNamespace.cc Tue Nov 13 15:13:53 2007 @@ -230,6 +230,111 @@ } + +YPythonNamespace::YPythonNamespace (string name, PyObject* function) + : m_name (name), + m_all_methods (true) { + + + PyObject * fun_code; //code of function + + //Declarations (using YPCDelcarations python module) + YCPDeclarations *decl = YCPDeclarations::instance(); + //YCPDeclarations *decl = new YCPDeclarations(); + + FunctionTypePtr sym_tp; + std::vector<constTypePtr> list_of_types; + int tmp; + + int count = 0; // position. arbitrary numbering + long num = 0; //number of function arguments + + + fun_code = PyFunction_GetCode(function); + num = ((PyCodeObject *) fun_code)->co_argcount; + string fun_name = PyString_AsString(((PyCodeObject *) fun_code)->co_name); + + if (decl->exists((PyFunctionObject *)function) + && decl->numParams((PyFunctionObject *)function) == num){ + + sym_tp = new FunctionType(decl->returnType((PyFunctionObject *)function)); + + list_of_types = decl->params((PyFunctionObject *)function); + tmp = list_of_types.size(); + for (int i=0; i < tmp; i++){ + sym_tp->concat(list_of_types[i]); + } + } else { + sym_tp = new FunctionType(Type::Any); + //y2milestone ("Number of parameters: %d", num); + //add types and number of arguments into SymbolEntry table + for (long j = 0; j < num; j++) { + sym_tp->concat(Type::Any); + } + } + //y2milestone ("Callable function %s", PyString_AsString(item)); + // symbol entry for the function + SymbolEntry *fun_se = new SymbolEntry ( + this, + count++, // position. arbitrary numbering. must stay consistent when? + fun_name.c_str(), // passed to Ustring, no need to strdup + SymbolEntry::c_function, + sym_tp); + fun_se->setGlobal (true); + + // enter it to the symbol table + enterSymbol (fun_se, 0); + + + y2milestone ("(special) YPythonNamespace finish"); + +} + +SymbolEntry * YPythonNamespace::AddFunction (PyObject* function) { + + //Declarations (using YPCDelcarations python module) + YCPDeclarations *decl = YCPDeclarations::instance(); + int tmp; + std::vector<constTypePtr> list_of_types; + FunctionTypePtr sym_tp; + PyObject *fun_code = PyFunction_GetCode(function); + int num = ((PyCodeObject *) fun_code)->co_argcount; + string fun_name = PyString_AsString(((PyCodeObject *) fun_code)->co_name); + + if (decl->exists((PyFunctionObject *)function) + && decl->numParams((PyFunctionObject *)function) == num){ + + sym_tp = new FunctionType(decl->returnType((PyFunctionObject *)function)); + + list_of_types = decl->params((PyFunctionObject *)function); + tmp = list_of_types.size(); + for (int i=0; i < tmp; i++){ + sym_tp->concat(list_of_types[i]); + } + } else { + sym_tp = new FunctionType(Type::Any); + //y2milestone ("Number of parameters: %d", num); + //add types and number of arguments into SymbolEntry table + for (long j = 0; j < num; j++) { + sym_tp->concat(Type::Any); + } + } + // symbol entry for the function + SymbolEntry *fun_se = new SymbolEntry ( + this, + 0, // position. arbitrary numbering. must stay consistent when? + fun_name.c_str(), // passed to Ustring, no need to strdup + SymbolEntry::c_function, + sym_tp); + + fun_se->setGlobal (true); + + enterSymbol (fun_se, 0); + + return fun_se; +} + + YPythonNamespace::~YPythonNamespace () { @@ -261,14 +366,18 @@ return YCPNull (); } + // It seems that this is the standard implementation. why would we // ever want it to be different? Y2Function* YPythonNamespace::createFunctionCall (const string name, constFunctionTypePtr required_type) { y2debug ("Python creating function call for %s", name.c_str ()); - TableEntry *func_te = table ()->find (name.c_str (), SymbolEntry::c_function); + //TableEntry *func_te = table ()->find (name.c_str (), SymbolEntry::c_function); + TableEntry *func_te = table ()->find (name.c_str ()); + if (func_te) { + //cout << "namespace: " << m_name << " function: " << name << endl; constTypePtr t = required_type ? required_type : (constFunctionTypePtr)func_te->sentry()->type (); if (m_all_methods) { @@ -279,6 +388,8 @@ return new Y2PythonSubCall (m_name, name, t); } } + + //cout << "namespace: " << m_name << " function: " << name << endl; y2error ("No such function %s", name.c_str ()); return NULL; } Modified: trunk/python-bindings/src/YPythonNamespace.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPythonNames… ============================================================================== --- trunk/python-bindings/src/YPythonNamespace.h (original) +++ trunk/python-bindings/src/YPythonNamespace.h Tue Nov 13 15:13:53 2007 @@ -13,12 +13,29 @@ string m_name; //! this namespace's name, eg. XML::Writer bool m_all_methods; //! add the class name to all calls public: + /** * Construct an interface. The module must be already loaded * @param name eg "XML::Writer" */ YPythonNamespace (string name); + /** + * Construct an interface. The module must be already loaded + * special contruct for calling python function such as reference + * @param name eg "XML::Writer" + * @param function function defined in python + */ + YPythonNamespace (string name, PyObject* function); + + /** + * Add new function into namespace + * @param Y2Namespace pointer to namespace for adding function + * @param PyObject pointer to function + * @return SymbolEntry pointer to added symbol entry else NULL (if failed) + */ + SymbolEntry * AddFunction (PyObject* function); + virtual ~YPythonNamespace (); //! what namespace do we implement -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42020 - /branches/tmp/sh/mod-ui/ncurses/src/STATUS
by gs＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: gs Date: Tue Nov 13 15:03:58 2007 New Revision: 42020 URL: http://svn.opensuse.org/viewcvs/yast?rev=42020&view=rev Log: more comments Modified: branches/tmp/sh/mod-ui/ncurses/src/STATUS Modified: branches/tmp/sh/mod-ui/ncurses/src/STATUS URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/STA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/STATUS (original) +++ branches/tmp/sh/mod-ui/ncurses/src/STATUS Tue Nov 13 15:03:58 2007 @@ -24,7 +24,7 @@ NCTable - examples work correctly - but check whether setting the header works - correctly in any case, TO DO: enable code with NCPopupMenu (sorting) + in any case, TO DO: enable code with NCPopupMenu (sorting) NCAskForDirectory/NCAskForFile - ComboBox values are added twice @@ -39,6 +39,7 @@ ------ EVENTs (class NCursesEvent, example Events.ycp) - example works correctly except of problem with NCPopupInfo on F1 + (y2base terminates if popup is open and a timout event is sent) - TO DO: get rid of YCPValue in class NCursesEvent -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42019 - /branches/tmp/sh/mod-ui/ncurses/src/STATUS
by gs＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: gs Date: Tue Nov 13 14:58:22 2007 New Revision: 42019 URL: http://svn.opensuse.org/viewcvs/yast?rev=42019&view=rev Log: mod-ui status Added: branches/tmp/sh/mod-ui/ncurses/src/STATUS Added: branches/tmp/sh/mod-ui/ncurses/src/STATUS URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/STA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/STATUS (added) +++ branches/tmp/sh/mod-ui/ncurses/src/STATUS Tue Nov 13 14:58:22 2007 @@ -0,0 +1,72 @@ + +DONE - all UI examples work correctly/no known problems +---- +NCTree +NCMuliSelectionBox +NCComboBox +NCIntField +NCInputField +NCPushBUtton +NCAlignment +NCMultiLineEdit + + + +almost DONE - all UI examples work (correctly or only with minor problems)/ +----------- some further checks/tests required + +NCRichText +- hyperlink doesn't work + +NCMenuButton +- all examples work correctly - but ChangeWidget has to be tested + (rebuildTree is a NOP so far) + +NCTable +- examples work correctly - but check whether setting the header works + correctly in any case, TO DO: enable code with NCPopupMenu (sorting) + +NCAskForDirectory/NCAskForFile +- ComboBox values are added twice + +NCSelectioBox +- ChangeWidget for empty list doesn't work (SelectionBox-replace-items1.ycp) + + + + +TESTED - all UI examples tested/unsolved problems existing +------ +EVENTs (class NCursesEvent, example Events.ycp) +- example works correctly except of problem with NCPopupInfo on F1 +- TO DO: get rid of YCPValue in class NCursesEvent + + + +MORE tests required +------------------- +ENCODING correct (UTF-8 encoding/NCstring) ??? - both for input +(e.g. NCInputField) and text output; +test ChangeWidget for every widget + + +NOT yet PORTED: +--------------- +NCDialog: not ported at all because YDialog isn't ported yet + +PackageSelector: +At the moment works with existing code, i.e. still reads the ycp layout +file and therefore uses YCP widget ids internally to get the menu selection +and button ids. +TODO: +- activate remaining NCPkgPopups(selection, pattern, language) +- fix NCPkgPopups for rpm tree, search and dependencies (work only + basically at the moment) +- create layout with widget factory, +- get rid of the YCP ids, + + + + + + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42018 - in /trunk/autoinstallation: package/autoyast2.changes src/clients/inst_autosetup.ycp src/include/io.ycp src/modules/ProfileLocation.ycp
by ug＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: ug Date: Tue Nov 13 14:42:16 2007 New Revision: 42018 URL: http://svn.opensuse.org/viewcvs/yast?rev=42018&view=rev Log: relative path for autoyast profile (first part of feature #302973) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/inst_autosetup.ycp trunk/autoinstallation/src/include/io.ycp trunk/autoinstallation/src/modules/ProfileLocation.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Nov 13 14:42:16 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 13 14:40:21 CET 2007 - ug(a)suse.de + +- relative path for autoyast profile + (first part of feature #302973) + +------------------------------------------------------------------- Fri Nov 9 12:02:40 CET 2007 - ug(a)suse.de - copy modified profile to the installed system too (#328837) Modified: trunk/autoinstallation/src/clients/inst_autosetup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autosetup.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autosetup.ycp Tue Nov 13 14:42:16 2007 @@ -48,7 +48,7 @@ return `abort; } string cpcmd = sformat("mv %1 %2","/tmp/profile/autoinst.xml", "/tmp/profile/pre-autoinst.xml"); - y2milestone("moving original profile: %1",cpcmd); + y2milestone("copy original profile: %1",cpcmd); SCR::Execute(.target.bash, cpcmd); cpcmd = sformat("mv %1 %2", AutoinstConfig::modified_profile, "/tmp/profile/autoinst.xml"); Modified: trunk/autoinstallation/src/include/io.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/io.… ============================================================================== --- trunk/autoinstallation/src/include/io.ycp (original) +++ trunk/autoinstallation/src/include/io.ycp Tue Nov 13 14:42:16 2007 @@ -257,7 +257,7 @@ } // catching nested devices done - string mounts = (string)(SCR::Read (.target.string, "/etc/mtab")); + string mounts = (string)(SCR::Read (.target.string, "/proc/mounts")); list<string> mount_list = splitstring( mounts, "\n" ); boolean already_mounted = false; foreach( string m, mount_list, ``{ Modified: trunk/autoinstallation/src/modules/ProfileLocation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Pro… ============================================================================== --- trunk/autoinstallation/src/modules/ProfileLocation.ycp (original) +++ trunk/autoinstallation/src/modules/ProfileLocation.ycp Tue Nov 13 14:42:16 2007 @@ -49,6 +49,32 @@ boolean is_directory = false; + if( AutoinstConfig::scheme == "relurl" ) { + // FIXME: + // file # local file + + AutoinstConfig::scheme = (string)SCR::Read(.etc.install_inf.InstMode); + if( AutoinstConfig::scheme == "hd" || AutoinstConfig::scheme == "harddisk" || AutoinstConfig::scheme == "disk" ) { + string part = (string)SCR::Read(.etc.install_inf.Partition); + AutoinstConfig::scheme = "device"; + AutoinstConfig::host = part; + AutoinstConfig::filepath = (string)SCR::Read(.etc.install_inf.Serverdir) + "/" + AutoinstConfig::filepath;; + } else { + if( AutoinstConfig::scheme == "cd" || AutoinstConfig::scheme == "cdrom" ) { + AutoinstConfig::scheme = "file"; + } + if( size(AutoinstConfig::filepath) > 0 ) { + AutoinstConfig::filepath = (string)SCR::Read(.etc.install_inf.Serverdir)+"/"+AutoinstConfig::host+"/"+AutoinstConfig::filepath; + } else { + AutoinstConfig::filepath = (string)SCR::Read(.etc.install_inf.Serverdir)+"/"+AutoinstConfig::host; + } + if( (string)SCR::Read(.etc.install_inf.Server) != nil ) { + AutoinstConfig::host = (string)SCR::Read(.etc.install_inf.Server); + } + } + + y2milestone("relurl for profile changed to: %1://%2%3",AutoinstConfig::scheme, AutoinstConfig::host, AutoinstConfig::filepath); + } string filename = basename(AutoinstConfig::filepath); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42017 - in /trunk/core: liby2util-r/Makefile.am liby2util-r/src/Makefile.am yast2-core.spec.in
by mvidner＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: mvidner Date: Tue Nov 13 14:40:13 2007 New Revision: 42017 URL: http://svn.opensuse.org/viewcvs/yast?rev=42017&view=rev Log: enabled testsuite, fixed linking Modified: trunk/core/liby2util-r/Makefile.am trunk/core/liby2util-r/src/Makefile.am trunk/core/yast2-core.spec.in Modified: trunk/core/liby2util-r/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/Makefile.am?rev… ============================================================================== --- trunk/core/liby2util-r/Makefile.am (original) +++ trunk/core/liby2util-r/Makefile.am Tue Nov 13 14:40:13 2007 @@ -1 +1 @@ -SUBDIRS=src +SUBDIRS=src testsuite Modified: trunk/core/liby2util-r/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/Makefile.am… ============================================================================== --- trunk/core/liby2util-r/src/Makefile.am (original) +++ trunk/core/liby2util-r/src/Makefile.am Tue Nov 13 14:40:13 2007 @@ -27,4 +27,4 @@ liby2util_la_LDFLAGS = -version-info 4:0:0 -liby2util_la_LIBADD = #-lutil -lz $(OPENSSL_LIBS) -lxml2 +liby2util_la_LIBADD = -lutil Modified: trunk/core/yast2-core.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/yast2-core.spec.in?rev=4201… ============================================================================== --- trunk/core/yast2-core.spec.in (original) +++ trunk/core/yast2-core.spec.in Tue Nov 13 14:40:13 2007 @@ -67,7 +67,6 @@ Obsoletes: yast2-core-translator-devel Provides: yast2-core-scr-soho-devel Obsoletes: yast2-core-scr-soho-devel -Requires: liby2util-devel Requires: libxcrypt-devel hwinfo-devel ncurses-devel Requires: glibc-devel libstdc++-devel pcre-devel blocxx-devel sysfsutils # for FlexLexer.h; I think that this dependency could be made -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0